Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
823,238 Commits 3 Branches 0 Tags
d7b3cdc705b120ec7dadfbb2d16dcabce5128d3d
Commit Graph

823238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Myren
d7b3cdc705 Revert "Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS" 
Revert submission 19682544-usage-stats

Reason for revert: b/243572246
Bug: 243572246
Reverted Changes:
Ib8b1bdff0:Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIO...
I1ac0ca320:Add test for app op permission mappings

Change-Id: I9f2da8d32a88566fc39ad3272fe4caa69d8d5aca
 2022-08-24 16:14:29 +00:00
Nate Myren
77ff81bc42 Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS 
Fixes: 243182796
Test: atest AppOpDefinitionTest
Change-Id: Ib8b1bdff066b2b69a42854ae7cfa652ad8f8b1f4
 2022-08-19 16:21:52 -07:00
Nolan Scobie
36a571bf15 Merge "Fix Canvas#drawVertices color blending when no shader is provided" into tm-qpr-dev am: 716c5618df am: 1a4bf8335f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19558695

Change-Id: I8a88883d58b4ce2a81c03ecab49e7467f961405e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:14:32 +00:00
Joshua Mccloskey
1d63de8c88 [automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 am: 5f73e94b27 -s ours am: 9c0bc3d8fe -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 bfd27670ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: I94dc24ac819fd1fc53474bf8d94fd3955dbe6fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:14:01 +00:00
Joshua Mccloskey
c156af7340 [automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 -s ours am: 83d28ff707 -s ours am: 6906b7fbf1 -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: I500f5570981c6ddffc2edf1c7f8d1aaf3254a5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:12:52 +00:00
Joshua McCloskey
45b7c19a62 [automerger skipped] Updated keyguard to be robust against fpm am: bfd27670ae -s ours am: e92f1e97c5 -s ours am: d946867dcd -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: Ic2aba38beecdfd3475613b9b35078b94d2e262a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:12:25 +00:00
Alejandro Nijamkin
effd633390 Merge "Take home controls setting into account" into tm-qpr-dev am: bca7840e34 am: 5937fbbe60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19551644

Change-Id: I3a62936240bcc0d0870571cfc68772a5644840ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:11:46 +00:00
Fabian Kozynski
3c7114f910 Merge "Reduce blocking calls to Settings in main thread" into tm-qpr-dev am: bf928790ec am: d9e0f16998 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498369

Change-Id: I457ac6ffe8ed06e5f05a6d8edbb07dea38728dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:09:01 +00:00
Winson Chung
21e626ea2a Merge "Add some client side logging for interrupted draws to the dump" 2022-08-09 21:08:12 +00:00
Nolan Scobie
1a4bf8335f Merge "Fix Canvas#drawVertices color blending when no shader is provided" into tm-qpr-dev am: 716c5618df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19558695

Change-Id: I759f579b9e468673c85d9388f5165826e85562f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 21:07:17 +00:00
Nolan Scobie
716c5618df Merge "Fix Canvas#drawVertices color blending when no shader is provided" into tm-qpr-dev 2022-08-09 20:50:17 +00:00
Joshua Mccloskey
9c0bc3d8fe [automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 am: 5f73e94b27 -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 bfd27670ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: I83438d93f08c02c0487192ca1d10797913283477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:47:22 +00:00
Joshua Mccloskey
6906b7fbf1 [automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 -s ours am: 83d28ff707 -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: Idd12e3dc0d1033e30189de26eafa7489fd4a8ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:26:36 +00:00
Joshua McCloskey
d946867dcd [automerger skipped] Updated keyguard to be robust against fpm am: bfd27670ae -s ours am: e92f1e97c5 -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: Ic2c75f139c9fdb746db901aa6c4b08cb2ed7c4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:26:20 +00:00
Alejandro Nijamkin
5937fbbe60 Merge "Take home controls setting into account" into tm-qpr-dev am: bca7840e34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19551644

Change-Id: I5f0f24365253d3cb3e12bc4e3ab6b5bd5508bae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:25:58 +00:00
Fabian Kozynski
d9e0f16998 Merge "Reduce blocking calls to Settings in main thread" into tm-qpr-dev am: bf928790ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498369

Change-Id: I180e79d8037f2883523840c5f672df608813ec9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:24:07 +00:00
Joshua Mccloskey
83d28ff707 [automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: I65890595300454d8e7b4c52476337ca6ca0a1f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:16:40 +00:00
Joshua McCloskey
e92f1e97c5 [automerger skipped] Updated keyguard to be robust against fpm am: bfd27670ae -s ours 
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: Icffcdf75ce76d0b6a2be4a8215994e173964d1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:16:37 +00:00
Joshua Mccloskey
5f73e94b27 Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058

Change-Id: Ic627d03c89df6a4b088f614fc0ba1ab57db5bdb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 20:16:05 +00:00
Alejandro Nijamkin
bca7840e34 Merge "Take home controls setting into account" into tm-qpr-dev 2022-08-09 20:05:04 +00:00
Fabian Kozynski
bf928790ec Merge "Reduce blocking calls to Settings in main thread" into tm-qpr-dev 2022-08-09 20:03:03 +00:00
Joshua Mccloskey
2da48dba91 Merge "Updated keyguard to be robust against fpm" into tm-d1-dev 2022-08-09 19:47:01 +00:00
Yein Jo
3ee222aa2a Merge "Add a flag for rounded box charging ripple." into tm-qpr-dev am: 30093d741c am: b370e127fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519175

Change-Id: Ieb23caddd6ce256521289de3e4180ce29a910c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 19:42:13 +00:00
Jeff Sharkey
bd6c3f94a9 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643 am: ee6282d087 am: b7a2bcf976 am: ccfb40a9d8 am: 11e74d1552 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I988370d561ae870ab81755f8b249ac68bdc3327c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 19:41:06 +00:00
Yein Jo
b370e127fe Merge "Add a flag for rounded box charging ripple." into tm-qpr-dev am: 30093d741c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519175

Change-Id: I7003a707feb23f547b8d236fd6148d18f967fcaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 19:40:02 +00:00
Yein Jo
30093d741c Merge "Add a flag for rounded box charging ripple." into tm-qpr-dev 2022-08-09 19:22:17 +00:00
Jeff Sharkey
11e74d1552 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643 am: ee6282d087 am: b7a2bcf976 am: ccfb40a9d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I296b441d44ff2b368483fcd8932414d7ffa090f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:59:49 +00:00
Jeff Sharkey
ccfb40a9d8 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643 am: ee6282d087 am: b7a2bcf976 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I61767004a642b865f5ef042bcdebc05f0ddf7553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:42:54 +00:00
Andy Labrada
7ef5b0ef22 Merge "SurfaceFlingerPerfTests: Add arguments to simpleperf listener" 2022-08-09 18:39:15 +00:00
Andy Labrada
073fe9962d SurfaceFlingerPerfTests: Add arguments to simpleperf listener 
Added testing arguments to report certain events within surfaceflinger
and gather performance metrics.

Test: atest SurfaceFlingerPerfTests:SurfaceFlingerPerfTest
Bug: 230039226
Change-Id: Ic8f07222c8307223c030dab08f4acd3eb18e18aa
 2022-08-09 18:38:01 +00:00
TreeHugger Robot
f4b7cd0d17 Merge "Indenting DPC as per the linting rules" 2022-08-09 18:32:27 +00:00
Mateusz Cicheński
792fd0c911 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev am: 6bd105d566 am: d06d3cd4a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539084

Change-Id: I321a77e55ca7921347c551baa469e317c08447dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:24:00 +00:00
Treehugger Robot
581b694652 Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f am: 40987da89f am: 2d31031864 am: 76982c18ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: If6eacbec487ce6ca63d0d685f3b28cd7ec4e2926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:23:28 +00:00
An An Yu
0560f94bd6 Merge "Update WM Jetpack extensions prebuilt (From updated aosp branch, ran window:extensions:extensions:build)" into tm-qpr-dev am: 1ad95b58f3 am: 8bd97c09ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537448

Change-Id: Iba467118045705eccf3b39e88b6cf7ab5bdd4963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:21:55 +00:00
Automerger Merge Worker
232a4b774d Merge "Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: f8f3841ceb" into tm-qpr-dev-plus-aosp am: f780fb6798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I6980e6ed1e31e75901b72f010ce2007697fb976d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:19:26 +00:00
Long Ling
b0837dffc6 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: 8ecb11e398 am: 561e784fe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I70867c17c6ef185ad936d100c6da2670dd88155a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:17:29 +00:00
Jeff Sharkey
b7a2bcf976 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643 am: ee6282d087 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I058875cfab8d707df40d16585fded9333e112dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:16:03 +00:00
Mateusz Cicheński
d06d3cd4a9 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev am: 6bd105d566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19539084

Change-Id: I4ff99b5c2f12070cd659b96076df46a92a6cdfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:14:23 +00:00
Huihong Luo
b39957d4ee Merge "Remove getPrimaryPhysicalDisplayId" 2022-08-09 18:08:37 +00:00
Treehugger Robot
76982c18ce Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f am: 40987da89f am: 2d31031864 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: Icf423e47a981aac91d0df79b7de168f1189f794f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:05:17 +00:00
Mateusz Cicheński
6bd105d566 Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev 2022-08-09 17:53:55 +00:00
Treehugger Robot
2d31031864 Merge "Limit the accepted length of SIM PIN to 8 digits" am: 7547a2454d am: 8b97661f1f am: 40987da89f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/188723

Change-Id: I3dee96de9e4ca626ba5591bc59c47b0daf3886dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:49:05 +00:00
Jeff Sharkey
ee6282d087 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I8b323ef4668b05375d0825f9d34588468cf33662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:33 +00:00
An An Yu
8bd97c09ac Merge "Update WM Jetpack extensions prebuilt (From updated aosp branch, ran window:extensions:extensions:build)" into tm-qpr-dev am: 1ad95b58f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537448

Change-Id: Ie078c74d2797ab30b9481c0672d3a0343e567310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:20 +00:00
Automerger Merge Worker
f780fb6798 Merge "Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: f8f3841ceb" into tm-qpr-dev-plus-aosp 2022-08-09 17:48:11 +00:00
Long Ling
561e784fe6 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: 8ecb11e398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I2f8c0909ca4fb6f6622776ccbbd67ae921a99324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:47:43 +00:00
Long Ling
cf197f8441 Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b am: f8f3841ceb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519111

Change-Id: I37a73b8eba905b7670177a80167b508cdb073695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:47:36 +00:00
Jeff Sharkey
a27c2fd643 Merge "Migrate stringslint.py to AyeAye." 2022-08-09 17:29:23 +00:00
An An Yu
1ad95b58f3 Merge "Update WM Jetpack extensions prebuilt (From updated aosp branch, ran window:extensions:extensions:build)" into tm-qpr-dev 2022-08-09 17:26:09 +00:00
An An Yu
eb374a23aa Update WM Jetpack extensions prebuilt 
(From updated aosp branch, ran window:extensions:extensions:build)

Test: Manual on sample apps (SplitList, SplitMain, SplitTrampoline)
Bug: 241570741
Change-Id: I2229a019c48f012d1fd1ffcfeed74444d2f43212
 2022-08-09 10:25:18 -07:00