Merge "music: Remove deprecated MODE_WORLD_READABLE and MODE_WORLD_WRITEABLE" am: 3d199bc40a am: 52d3114a77 am: bf3353fed5
am: 4f1a861eed

* commit '4f1a861eede0eea635cec7abe30ba6bdb1d894ad':
  music: Remove deprecated MODE_WORLD_READABLE and MODE_WORLD_WRITEABLE

Change-Id: I282debc4d9c98db34ab8be5be93afacb904109aa
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 25d60c7..be8142f 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -335,7 +335,7 @@
                 | RemoteControlClient.FLAG_KEY_MEDIA_STOP;
         mRemoteControlClient.setTransportControlFlags(flags);
         
-        mPreferences = getSharedPreferences("Music", MODE_WORLD_READABLE | MODE_WORLD_WRITEABLE);
+        mPreferences = getSharedPreferences("Music", MODE_PRIVATE);
         mCardId = MusicUtils.getCardId(this);
         
         registerExternalStorageListener();
diff --git a/src/com/android/music/TouchInterceptor.java b/src/com/android/music/TouchInterceptor.java
index 90b208a..ebeef31 100644
--- a/src/com/android/music/TouchInterceptor.java
+++ b/src/com/android/music/TouchInterceptor.java
@@ -77,7 +77,7 @@
 
     public TouchInterceptor(Context context, AttributeSet attrs) {
         super(context, attrs);
-        SharedPreferences pref = context.getSharedPreferences("Music", 3);
+        SharedPreferences pref = context.getSharedPreferences("Music", 0);
         mRemoveMode = pref.getInt("deletemode", -1);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         Resources res = getResources();