Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,635 Commits 3 Branches 0 Tags
cf2da13db3c051918f2ce2a8dc49dee4fdc7a169
Commit Graph

638635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PETER LIANG
cf2da13db3 Merge "Revise the character limit of the string." into sc-dev 2021-04-29 02:51:30 +00:00
Rhed Jao
a659ad825f Merge "Fix missing the implementation of Computer#dump() in ComputerLocked" into sc-dev 2021-04-29 02:42:36 +00:00
Wei Sheng Shih
d79399ba3f Merge "Only add one starting window for a task when unlock." into sc-dev 2021-04-29 02:22:18 +00:00
TreeHugger Robot
f941b5a2f4 Merge "Recording alarm removal reasons for debugging" into sc-dev 2021-04-29 01:14:40 +00:00
TreeHugger Robot
091549478c Merge "Synchronize native ApkAssets data" into sc-dev 2021-04-29 01:11:03 +00:00
Chris Li
328079de27 Merge "Determine whether to support activities in multi window (1/n)" into sc-dev 2021-04-29 01:09:53 +00:00
Yohei Yukawa
c09a657113 Merge "Make IInputMethodPrivilegedOperations to async (5/N)" into sc-dev 2021-04-29 00:45:17 +00:00
TreeHugger Robot
7c9d3192de Merge "Fix stale EditorInfo upon EditText#setText()" into sc-dev 2021-04-29 00:42:23 +00:00
George Chang
469c7c8343 Merge "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into sc-dev 2021-04-29 00:13:08 +00:00
TreeHugger Robot
088d1b952c Merge "Fix tapping on divider bar several times makes split sloggish" into sc-dev 2021-04-29 00:09:14 +00:00
TreeHugger Robot
ac126aa920 Merge "Hide the manage menu when switching to overflow" into sc-dev 2021-04-29 00:05:29 +00:00
Treehugger Robot
0399c4944f [automerger skipped] Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a am: 1819888bfb am: faf48c00ae -s ours 
am skip reason: Merged-In I942d4c0c7c786d7c8b561e5e65773367cefffb31 with SHA-1 5bf8a8436f is already in history

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

Change-Id: Iee54e3eeafc0c15af6dfda4c6ad37addd850b813
 2021-04-28 23:31:44 +00:00
Treehugger Robot
284b71639f Merge "Update OWNERS for CachedAppOptimizer" am: 6ed3f581bb am: da34aa41a8 am: 0b5edbb77f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684130

Change-Id: I2da7f20955ec8cf5f53d82d3bac878c47c6b21e9
 2021-04-28 23:31:10 +00:00
Christine Franks
cd007b59c2 Merge "Check real virtual display id for input devices" into sc-dev 2021-04-28 23:27:33 +00:00
Treehugger Robot
faf48c00ae Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a am: 1819888bfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683909

Change-Id: I03d4f77bd168d642e2fa2514beb3fc2033cd39cf
 2021-04-28 23:11:58 +00:00
Treehugger Robot
0b5edbb77f Merge "Update OWNERS for CachedAppOptimizer" am: 6ed3f581bb am: da34aa41a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684130

Change-Id: Ia596c766764b8a235811ee75b9d5ba4e020c02b9
 2021-04-28 23:11:35 +00:00
Julia Reynolds
a54b71543a [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours am: a0d1066582 -s ours am: c44348150d -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I427b6a2c9e3cc9a0a76d2665273672cfc46b1fca
 2021-04-28 22:42:15 +00:00
Todd Kennedy
229773b648 Merge "PackageParser OWNERS noparent" am: 26a5186ab1 am: 159886625a am: 2678377c4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688565

Change-Id: Iacc17024700bdb7ac9c7d044288bd35b0dfb0054
 2021-04-28 22:41:50 +00:00
Treehugger Robot
1819888bfb Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683909

Change-Id: I9ddeafeacae76ecc4aa80eecd6503b2fea8378b9
 2021-04-28 22:28:31 +00:00
Julia Reynolds
e14ac7b727 [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours am: 27b30e8ced -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: If181da0ec2c4f4039db10117a7f0e34001e24aa8
 2021-04-28 22:22:29 +00:00
Treehugger Robot
da34aa41a8 Merge "Update OWNERS for CachedAppOptimizer" am: 6ed3f581bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684130

Change-Id: Ifb144bc700a0e2e730aa99bc8875873a86c37461
 2021-04-28 22:21:50 +00:00
Julia Reynolds
c44348150d [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours am: a0d1066582 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: I19491880ed7817982f83dcb2ea8d180b73733cfd
 2021-04-28 22:21:33 +00:00
Todd Kennedy
2678377c4b Merge "PackageParser OWNERS noparent" am: 26a5186ab1 am: 159886625a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688565

Change-Id: I40770bf3f2d5c706cd578548be07f4fa1f5f4565
 2021-04-28 22:15:56 +00:00
Treehugger Robot
c2c84d169a Merge "Expose carrier privilege rules certificates as @TestApi." 2021-04-28 22:13:50 +00:00
Julia Reynolds
27b30e8ced [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: I87f8f694dea99fb78baf6d8f0e5031dee4a464b3
 2021-04-28 22:08:30 +00:00
Treehugger Robot
6ed3f581bb Merge "Update OWNERS for CachedAppOptimizer" 2021-04-28 22:07:27 +00:00
Julia Reynolds
a0d1066582 [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: Ib3bb54f4f504df1672899a7470ad66abe6d77cab
 2021-04-28 22:06:50 +00:00
Todd Kennedy
159886625a Merge "PackageParser OWNERS noparent" am: 26a5186ab1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688565

Change-Id: I7ecf3b8cbaff927662f8288e7e0f53e8c3303d05
 2021-04-28 21:51:15 +00:00
Julia Reynolds
26925dd638 [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: Iaf9103ad8ba918cd3b836cc2ad63c07ef350a5e1
 2021-04-28 21:50:41 +00:00
Pinyao Ting
a2bbcf9523 Merge "Consolidate shortcut usage report api." into sc-dev 2021-04-28 21:46:37 +00:00
Todd Kennedy
26a5186ab1 Merge "PackageParser OWNERS noparent" 2021-04-28 21:28:50 +00:00
Julia Reynolds
eaf40f342d [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: If58dd4cc98f8ac2066b79f274e99a0a5169c0d9a
 2021-04-28 21:18:10 +00:00
Yi Jiang
424b267ef9 Merge "Cleans up lagecy annotations" into sc-dev 2021-04-28 21:15:18 +00:00
Jeff Sharkey
8d1d972856 Merge "Preserve legacy permission check behavior." into sc-dev 2021-04-28 21:10:07 +00:00
Ben Lin
cabb4a0317 Merge "PiP: Add ResizeGestureHandlerTest." into sc-dev 2021-04-28 20:59:04 +00:00
Kweku Adams
a5d30fba66 Merge "Add "restricted" to help command." into sc-dev 2021-04-28 20:55:10 +00:00
Suprabh Shukla
a8e003f538 Recording alarm removal reasons for debugging 
If an alarm is removed from the service for some reason, the bugreport
contains no useful information about it. Recording the last 10 removes
with their reason. For now, the set of reasons includes:
 - Data cleared on the calling app.
 - App requested to cancel it.
 - Exact alarm permission revoked.
 - PendingIntent used to set the alarm was cancelled.
More reasons can be added as seen useful in the future.

Test: adb shell dumpsys alarm
atest FrameworksMockingServicesTests:com.android.server.alarm
atest CtsAlarmManagerTestCases

Fixes: 184677899
Change-Id: I9d67b90572b5d731ad5d224ae7d537ae176508d5
 2021-04-28 13:51:08 -07:00
Ryan Mitchell
13587931e5 Synchronize native ApkAssets data 
If an ApkAssets is created and destroyed before being put into an
AssetManager, the native layer may not have been synchronized in the
thread that does Java object finalization. So when the Java object gets
deleted on the finalization thread, it may see old/unallocated native
data and not delete the native object correctly.

Similar to how we already lock on the native AssetManager whenever
entering the JNI layer, we should also do the same for ApkAssets.

Bug: 186528775
Test: boot and no crashes
Change-Id: I5fcb9e788a9e3cb8baeb92fa6efc882d5bbbf0b0
 2021-04-28 13:34:13 -07:00
Treehugger Robot
d22bbdfc19 Merge "Change the brackets in Arabic keyboard layout." am: 48144472ff am: b7ae4468fb am: f546892ff4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688784

Change-Id: Id3a8155e45de0d6f2f800878521386e3faecda1c
 2021-04-28 20:27:24 +00:00
Paul Crowley
0809d53d07 Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf am: 9c975f2335 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I2c7e8050ca82f81ca865a76bd11a39d82eb09dcc
 2021-04-28 20:26:08 +00:00
Yifan Hong
3be17c6711 Merge "AndroidRuntime.h: do not include IBinder.h" am: 92bd842472 am: 5d5581dc96 am: a4f89e68a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687048

Change-Id: Ie7ee4b276c0bcc682128fec3b9cd52dedf9ce5cf
 2021-04-28 20:25:40 +00:00
Andrei-Valentin Onea
cfb5663717 Merge "Replace source based system server stubs" am: e93cf9e566 am: fef2035b4f am: d2a270b4e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642060

Change-Id: I7208c8e14772a8b5ef5c090fb3913973d9350a3a
 2021-04-28 20:22:58 +00:00
Fabian Kozynski
a3a8f663dd Merge "Use full top padding even in HorizontalLayout" into sc-dev 2021-04-28 19:59:15 +00:00
Treehugger Robot
f546892ff4 Merge "Change the brackets in Arabic keyboard layout." am: 48144472ff am: b7ae4468fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688784

Change-Id: I846bf1183066c2223c5ff41c8bd2ddfd89c73288
 2021-04-28 19:52:34 +00:00
Paul Crowley
9c975f2335 Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I47281e410de8edf621836a501596419ea0cc1d7c
 2021-04-28 19:51:56 +00:00
Yifan Hong
a4f89e68a6 Merge "AndroidRuntime.h: do not include IBinder.h" am: 92bd842472 am: 5d5581dc96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687048

Change-Id: I5caed327131ff8c9f589046d05e42ff3f5998529
 2021-04-28 19:51:05 +00:00
Andrei-Valentin Onea
d2a270b4e0 Merge "Replace source based system server stubs" am: e93cf9e566 am: fef2035b4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642060

Change-Id: I7cb9f20139da99292954aa42985d1a7fcb1dc78e
 2021-04-28 19:49:38 +00:00
Treehugger Robot
b7ae4468fb Merge "Change the brackets in Arabic keyboard layout." am: 48144472ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688784

Change-Id: I65121f1590d7f93db73b4a3d360b7ae9efed9d40
 2021-04-28 19:37:37 +00:00
Fabian Kozynski
99ef33fe9c Merge changes I0fd62164,Iaa0f8de2,Id81aa3c7 into sc-dev 
* changes:
  Add animation for tiles second line
  Simplify animation code
  Fix credit card animation
 2021-04-28 19:33:44 +00:00
Paul Crowley
cf5f4d6cbf Merge changes from topic "biometric-unlocked-required" am: c36995ec84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I1bcdf2d01a8f4b81f1ebdc0e475db461c390bda6
 2021-04-28 19:23:40 +00:00