commit 52d3114a775741bee632b839d60b4032ba688205
author Dmitry Shmidt <dimitrysh@google.com> Tue Jun 07 00:18:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 07 00:18:38 2016 +0000
tree 97c404003c1e82e4428439b8c91948e5051a5985
parent c7af065066bcfb7ef425e7aebeee416da468d911
parent 3d199bc40a993eafcfe703b8002bfb9a5f1660e4

Merge "music: Remove deprecated MODE_WORLD_READABLE and MODE_WORLD_WRITEABLE"
am: 3d199bc40a

* commit '3d199bc40a993eafcfe703b8002bfb9a5f1660e4':
  music: Remove deprecated MODE_WORLD_READABLE and MODE_WORLD_WRITEABLE

Change-Id: I241a17401169b63c8b3f1e413642fb769158aa7f

src/com/android/music/MediaPlaybackService.java

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();

src/com/android/music/TouchInterceptor.java

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();