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

Commit eb7b2413 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7104876 from 595e3ee3 to rvc-qpr3-release 

Change-Id: I0a3834ac8d31078affea9cc9ba8793300dad2fa8
parents 34a8e797 595e3ee3

data/etc/car/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -128,13 +128,6 @@ prebuilt_etc { 
    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.car.companiondevicesupport",

    sub_dir: "permissions",

    src: "com.android.car.companiondevicesupport.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.google.android.car.kitchensink",

    sub_dir: "permissions",

data/etc/car/com.android.car.companiondevicesupport.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<permissions>

    <privapp-permissions package="com.android.car.companiondevicesupport">

      <permission name="android.permission.INTERACT_ACROSS_USERS"/>

      <permission name="android.permission.MANAGE_USERS"/>

      <permission name="android.permission.PROVIDE_TRUST_AGENT"/>

      <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

    </privapp-permissions>

</permissions>

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -20367,7 +20367,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
        int callerUid = Binder.getCallingUid();















        // Only system can toggle the freezer state













        if (callerUid == SYSTEM_UID) {













        if (callerUid == SYSTEM_UID || Build.IS_DEBUGGABLE) {















            return mOomAdjuster.mCachedAppOptimizer.enableFreezer(enable);















        } else {















            throw new SecurityException("Caller uid " + callerUid + " cannot set freezer state ");

























services/core/java/com/android/server/media/MediaShellCommand.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -64,7 +64,7 @@ public class MediaShellCommand extends ShellCommand {













        }















        if (sThread == null) {















            Looper.prepare();













            sThread = ActivityThread.systemMain();













            sThread = ActivityThread.currentActivityThread();















            Context context = sThread.getSystemContext();















            sMediaSessionManager =















                    (MediaSessionManager) context.getSystemService(Context.MEDIA_SESSION_SERVICE);