Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f87f16 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r66' into HEAD 

Android 6.0.1 release 66

# gpg: Signature made Tue 06 Sep 2016 09:26:45 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
parents caf9123b 90ea10c4

media/java/android/media/ExifInterface.java

+2258 −193

File changed.

Preview size limit exceeded, changes collapsed.

media/jni/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -42,13 +42,9 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcamera_client \

    libmtp \

    libusbhost \

    libjhead \

    libexif \

    libstagefright_amrnb_common



LOCAL_REQUIRED_MODULES := \

    libjhead_jni



LOCAL_STATIC_LIBRARIES := \

    libstagefright_amrnbenc

services/core/java/com/android/server/notification/NotificationManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -1991,6 +1991,7 @@ public class NotificationManagerService extends SystemService { 
        }



        private void enforcePolicyAccess(String pkg, String method) {

            checkCallerIsSameApp(pkg);

            if (!checkPolicyAccess(pkg)) {

                Slog.w(TAG, "Notification policy access denied calling " + method);

                throw new SecurityException("Notification policy access denied");
@@ -3629,6 +3630,10 @@ public class NotificationManagerService extends SystemService { 
        if (isCallerSystem()) {

            return;

        }

        checkCallerIsSameApp(pkg);

    }



    private static void checkCallerIsSameApp(String pkg) {

        final int uid = Binder.getCallingUid();

        try {

            ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ public class UserManagerService extends IUserManager.Stub { 
    @Override

    public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {

        if (userId != UserHandle.getCallingUserId()) {

            checkManageUsersPermission("getting profiles related to user " + userId);

            checkManageOrCreateUsersPermission("getting profiles related to user " + userId);

        }

        final long ident = Binder.clearCallingIdentity();

        try {

services/core/java/com/android/server/wm/WindowManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import android.os.SystemProperties; 
import android.os.SystemService;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.WorkSource;

import android.provider.Settings;

import android.util.ArraySet;
@@ -7687,6 +7688,12 @@ public class WindowManagerService extends IWindowManager.Stub 
                   + " milliseconds before attempting to detect safe mode.");

        }













        UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);













        if (um != null && um.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {













            mSafeMode = false;













            return false;













        }



























        int menuState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY,















                KeyEvent.KEYCODE_MENU);















        int sState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY, KeyEvent.KEYCODE_S);