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

Commit 8b8f2625 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cp-rvc-aosp" into sc-dev 

* changes:
  [automerged blank] Add Emergency callback mode shell command 2p: b201f9b1
  Add Emergency callback mode shell command
parents 3512bdfd 3c650124

api/Android.bp

+0 −46
Original line number Diff line number Diff line
@@ -347,49 +347,3 @@ genrule { 
    out: ["combined-removed-dex.txt"],

    cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",

}
 


genrule {

    name: "services-system-server-current.txt",

    srcs: [

        ":service-permission{.system-server.api.txt}",

        ":non-updatable-system-server-current.txt",

    ],

    out: ["system-server-current.txt"],

    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-server-current.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            dir: "apistubs/android/system-server/api",

            dest: "merge-android.txt",

        },

    ],

}



genrule {

    name: "services-system-server-removed.txt",

    srcs: [

        ":service-permission{.system-server.removed-api.txt}",

        ":non-updatable-system-server-removed.txt",

    ],

    out: ["system-server-removed.txt"],

    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-server-removed.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            dir: "apistubs/android/system-server/api",

            dest: "merge-removed.txt",

        },

    ],

}

core/java/android/view/OWNERS

+0 −4
Original line number Diff line number Diff line
@@ -77,7 +77,3 @@ per-file SyncRtSurfaceTransactionApplier.java = file:/services/core/java/com/and 
per-file ViewRootInsetsControllerHost.java = file:/services/core/java/com/android/server/wm/OWNERS

per-file Window*.java = file:/services/core/java/com/android/server/wm/OWNERS

per-file Window*.aidl = file:/services/core/java/com/android/server/wm/OWNERS
 


# Scroll Capture

per-file *ScrollCapture*.java = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS

per-file *CaptureHelper*.java = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS

core/java/com/android/internal/view/OWNERS

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,3 @@ per-file AppearanceRegion = file:/services/core/java/com/android/server/wm/OWNER 
per-file BaseIWIndow.java = file:/services/core/java/com/android/server/wm/OWNERS

per-file RotationPolicy.java = file:/services/core/java/com/android/server/wm/OWNERS

per-file WindowManagerPolicyThread.java = file:/services/core/java/com/android/server/wm/OWNERS
 


# Scroll Capture

per-file *ScrollCapture*.java = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS

per-file *CaptureHelper*.java = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS

core/jni/OWNERS

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ per-file android_os_HwParcel* = file:platform/system/libhwbinder:/OWNERS 
per-file android_os_HwRemoteBinder* = file:platform/system/libhwbinder:/OWNERS

per-file EphemeralStorage* = file:platform/system/libhwbinder:/OWNERS



# Sensor

per-file android_hardware_SensorManager* = arthuri@google.com, bduddie@google.com, stange@google.com



per-file *Zygote* = file:/ZYGOTE_OWNERS

per-file Android.bp = file:platform/build/soong:/OWNERS

per-file android_animation_* = file:/core/java/android/animation/OWNERS

core/tests/coretests/src/android/view/OWNERS

+0 −3
Original line number Diff line number Diff line
@@ -9,6 +9,3 @@ per-file *Focus* = file:/services/core/java/com/android/server/wm/OWNERS 
per-file *Insets* = file:/services/core/java/com/android/server/wm/OWNERS

per-file *View* = file:/services/core/java/com/android/server/wm/OWNERS

per-file *Visibility* = file:/services/core/java/com/android/server/wm/OWNERS
 


# Scroll Capture

per-file *ScrollCapture*.java = file:/packages/SystemUI/src/com/android/systemui/screenshot/OWNERS