Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,994 Commits 3 Branches 0 Tags
a7b4e34cff494ee97696e72f3cef99ccda7231de
Commit Graph

762994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Sullivan
a7b4e34cff Merge "Add split perms from W_E_S to media" into tm-dev am: 5f73823cf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415235

Change-Id: I67686626631cc8194260f3f2b5a810fb8442ebd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 23:15:28 +00:00
Automerger Merge Worker
6c2255b1e2 Merge "Merge "Calculate min height for header in code" into tm-dev am: 04269d836b" 2022-03-28 23:15:12 +00:00
TreeHugger Robot
ea5cb65ee1 Merge "Calculate min height for header in code" into tm-dev am: 04269d836b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17386554

Change-Id: I470b35b30dd28603280715cbdcd3b8900fbdb462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 23:14:42 +00:00
Roderick Sheeter
e62ad9012c Merge changes from topic "compat_pua" into tm-mainline-prod am: 9e5f36f527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17418819

Change-Id: I49bb1d2e6281fe2e3a417014207f23fbf011a909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 23:14:25 +00:00
Roderick Sheeter
e788a6e0be Merge "Update fontchain_lint to detect lack of PUA in emoji font" into tm-dev am: 52a6e5b78b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17418819

Change-Id: Ifcdef7f9f598c2cd4eecab86790478d55983fcf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 23:13:46 +00:00
Jay Sullivan
5f73823cf5 Merge "Add split perms from W_E_S to media" into tm-dev 2022-03-28 23:12:40 +00:00
TreeHugger Robot
04269d836b Merge "Calculate min height for header in code" into tm-dev 2022-03-28 23:03:21 +00:00
Roderick Sheeter
9e5f36f527 Merge changes from topic "compat_pua" into tm-mainline-prod 
* changes:
  [automerge] Update fontchain_lint to detect lack of PUA in emoji font 2p: 353491d69a
  Update fontchain_lint to detect lack of PUA in emoji font
 2022-03-28 22:57:34 +00:00
Roderick Sheeter
52a6e5b78b Merge "Update fontchain_lint to detect lack of PUA in emoji font" into tm-dev 2022-03-28 22:57:34 +00:00
Roderick Sheeter
12c08503ab Merge changes from topic "compat_pua" 
* changes:
  [automerge] Update fontchain_lint to detect lack of PUA in emoji font 2p: 353491d69a 2p: 0fbc182518
  [automerge] Update fontchain_lint to detect lack of PUA in emoji font 2p: 353491d69a
  Update fontchain_lint to detect lack of PUA in emoji font
 2022-03-28 22:57:33 +00:00
Haoyu Zhang
d0f213fbaa Merge "[Scribe] Support extended handwriting boundary" 2022-03-28 21:51:23 +00:00
Aaron Liu
3c1267d76c Merge "Merge "Bouncer: Remove flicker of KeyguardMessageArea" into tm-dev am: 5423eb462b am: 3f88d7f338" 2022-03-28 21:02:59 +00:00
Sharon Su
fe138c84ea [automerger skipped] Merge "Add more status code to cinematic effect response." into tm-dev am: 589c1ad6ba -s ours am: 6b07a0afce -s ours 
am skip reason: Merged-In I26dfc53b22817953839d9882398a502ea7293c08 with SHA-1 26aff6fbcb is already in history

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

Change-Id: Ic73eed7cb40f5a9fcb908d595bfac56b90314389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:46:52 +00:00
Ameer Armaly
02363477f4 Merge "Service Gesture Detection: copy motion events when sending to the service." into tm-dev am: 9dcf6ab3ab am: 016dde9688 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325809

Change-Id: I200cd55cabff08726c7c24cb1d909c1b05819c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:46:21 +00:00
Sharon Su
6b07a0afce [automerger skipped] Merge "Add more status code to cinematic effect response." into tm-dev am: 589c1ad6ba -s ours 
am skip reason: Merged-In I26dfc53b22817953839d9882398a502ea7293c08 with SHA-1 26aff6fbcb is already in history

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

Change-Id: Ie03c3a40c15f111e41ea3da29f3928521d4339ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:46:10 +00:00
TreeHugger Robot
f7d39bc4b0 Merge "Changes to reduce flakiness of TrustTests" into tm-dev am: 0d97e88c02 am: 9adbb5ed45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391844

Change-Id: Ic11a860c8660c57df60441299f611e31f4b73017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:45:39 +00:00
Sharon Su
d34834ee12 [automerger skipped] Merge changes from topic "presubmit-am-f04b1af21e1948349974894350d43dbd" into tm-mainline-prod am: ae61201707 -s ours 
am skip reason: Merged-In I26dfc53b22817953839d9882398a502ea7293c08 with SHA-1 26aff6fbcb is already in history

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

Change-Id: I94138b85d2f71a8815d9f656f4cd2de61b0a9492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:45:05 +00:00
Sharon Su
be9e0a6ae8 [automerger skipped] Merge "Add more status code to cinematic effect response." into tm-dev am: 589c1ad6ba -s ours 
am skip reason: Merged-In I26dfc53b22817953839d9882398a502ea7293c08 with SHA-1 26aff6fbcb is already in history

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

Change-Id: Id6275d7c38003be1d8bafdf75e95059174a2cd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:44:19 +00:00
Ameer Armaly
016dde9688 Merge "Service Gesture Detection: copy motion events when sending to the service." into tm-dev am: 9dcf6ab3ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325809

Change-Id: I8b60b9e9c38352b2a6fc144424d6ad51f57f76a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:43:45 +00:00
Automerger Merge Worker
74c1604ed6 Merge "Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" into tm-mainline-prod am: 499455169c" 2022-03-28 20:43:10 +00:00
Ameer Armaly
04f0672eee Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" into tm-mainline-prod am: 499455169c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325809

Change-Id: I69e9963ff025dbe86155c31c6c04bf96c7de8fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:42:39 +00:00
Ameer Armaly
488ac97f4d Merge "Service Gesture Detection: copy motion events when sending to the service." into tm-dev am: 9dcf6ab3ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325809

Change-Id: I212d1b34c64e6cb047c3314140634bf8a3991992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:42:34 +00:00
Automerger Merge Worker
3a7ab953dc Merge "Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" into tm-mainline-prod am: 825609d299" 2022-03-28 20:42:09 +00:00
TreeHugger Robot
78ee8673d3 Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" into tm-mainline-prod am: 825609d299 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391844

Change-Id: I1debefe9c33d534f6723ff7be4e1608c2e0afa26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:41:29 +00:00
TreeHugger Robot
ca03d8fee5 Merge "Changes to reduce flakiness of TrustTests" into tm-dev am: 0d97e88c02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391844

Change-Id: I00aa5a0553661f462e1a7e3350a3499181ef63f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:41:15 +00:00
TreeHugger Robot
9adbb5ed45 Merge "Changes to reduce flakiness of TrustTests" into tm-dev am: 0d97e88c02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391844

Change-Id: Idfac00788a9b67ccf135779402037d1073fc0f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:41:05 +00:00
Sharon Su
589c1ad6ba Merge "Add more status code to cinematic effect response." into tm-dev 2022-03-28 20:39:33 +00:00
Sharon Su
ae61201707 Merge changes from topic "presubmit-am-f04b1af21e1948349974894350d43dbd" into tm-mainline-prod 
* changes:
  [automerge] Add more status code to cinematic effect response. 2p: 26aff6fbcb
  Add more status code to cinematic effect response.
 2022-03-28 20:39:33 +00:00
Sharon Su
4870b27878 Merge changes from topic "presubmit-am-f04b1af21e1948349974894350d43dbd" 
* changes:
  [automerged blank] Add more status code to cinematic effect response. 2p: 26aff6fbcb 2p: fefd7b09c0
  [automerge] Add more status code to cinematic effect response. 2p: 26aff6fbcb
  Add more status code to cinematic effect response.
 2022-03-28 20:39:32 +00:00
Ameer Armaly
9dcf6ab3ab Merge "Service Gesture Detection: copy motion events when sending to the service." into tm-dev 2022-03-28 20:21:46 +00:00
Ameer Armaly
499455169c Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" into tm-mainline-prod 
* changes:
  [automerge] Service Gesture Detection: copy motion events when sending to the service. 2p: 2a7ab6e857
  Service Gesture Detection: copy motion events when sending to the service.
 2022-03-28 20:21:46 +00:00
Ameer Armaly
492ec70dc6 Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" 
* changes:
  [automerge] Service Gesture Detection: copy motion events when sending to the service. 2p: 2a7ab6e857 2p: 28c729645d
  [automerge] Service Gesture Detection: copy motion events when sending to the service. 2p: 2a7ab6e857
  Service Gesture Detection: copy motion events when sending to the service.
 2022-03-28 20:21:45 +00:00
TreeHugger Robot
825609d299 Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" into tm-mainline-prod 
* changes:
  [automerge] Changes to reduce flakiness of TrustTests 2p: c7dd3cabf3
  Changes to reduce flakiness of TrustTests
 2022-03-28 20:13:04 +00:00
TreeHugger Robot
0d97e88c02 Merge "Changes to reduce flakiness of TrustTests" into tm-dev 2022-03-28 20:13:04 +00:00
TreeHugger Robot
0da1ec4f8d Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" 
* changes:
  [automerge] Changes to reduce flakiness of TrustTests 2p: c7dd3cabf3 2p: b68a5cfcb7
  [automerge] Changes to reduce flakiness of TrustTests 2p: c7dd3cabf3
  Changes to reduce flakiness of TrustTests
 2022-03-28 20:13:03 +00:00
Andy Hung
a419634eea Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev am: 6a1b6bc9da am: 183ad1f715 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260888

Change-Id: I2b7cd7f243f57ef7c778eaa7e0209035f8a08e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:09:28 +00:00
Yuri Lin
29e2d7930b Merge "Write ZenPolicy conversation settings out to XML" into tm-dev am: 1a9c4a2a3d am: e5d457f9af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17355880

Change-Id: I2fb7ca232c0bf7da69a3424bf318becd5f583ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:08:46 +00:00
Prabir Pradhan
de14bacdd0 Merge "Ensure handwriting session can only be started from inside app bounds" into tm-dev am: a4f617f451 am: e871ce1410 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071330

Change-Id: I82e1aeb292cab3175a88ed89881e47e21d9ac248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 20:08:05 +00:00
Jay Thomas Sullivan
9b78af4292 Add split perms from W_E_S to media 
Add split permissions from WRITE_EXTERNAL_STORAGE to media permissions.

The reason for doing this is that the split-permission handling code
doesn't handle recursive split-permission mappings, but only direct
mappings.

This resulted in a problem with WRITE_EXTERNAL_STORAGE because:

1) WRITE_EXTERNAL_STORAGE splits into READ_EXTERNAL_STORAGE, and
2) Recently, we added split permissions from READ_EXTERNAL_STORAGE
to READ_MEDIA_AUDIO, READ_MEDIA_IMAGES, READ_MEDIA_VIDEO, and
ACCESS_MEDIA_LOCATION

The effect is that apps which request WRITE_EXTERNAL_STORAGE are not
being granted media storage permissions properly.

(Note that, for now, we've not yet added the split to
ACCESS_MEDIA_LOCATION, because this scenario has not yet been
thoroughly tested.)

Bug: 222238273
Test: atest CtsPermissionTestCases CtsPermission3TestCases SplitPermissionsSystemTest
Change-Id: I94694b37189ea8ad89edc4f478391ccfe1ccd5b8
 2022-03-28 19:51:38 +00:00
Andy Hung
aea58299b8 Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev am: 6a1b6bc9da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260888

Change-Id: If995d0f5821e2dc74d00d07564e8360d10b3c8ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:47:52 +00:00
Andy Hung
183ad1f715 Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev am: 6a1b6bc9da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260888

Change-Id: I113feb94de2085399e508f90883446e5d4179cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:47:32 +00:00
Yuri Lin
e5d457f9af Merge "Write ZenPolicy conversation settings out to XML" into tm-dev am: 1a9c4a2a3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17355880

Change-Id: If848fadb474148ad82fda2a1f47bd18e32685edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:47:10 +00:00
Yuri Lin
4776ee474e Merge "Write ZenPolicy conversation settings out to XML" into tm-dev am: 1a9c4a2a3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17355880

Change-Id: Ie8fe22e7901c178b238a2dd6d437f1417054992f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:47:03 +00:00
Prabir Pradhan
e871ce1410 Merge "Ensure handwriting session can only be started from inside app bounds" into tm-dev am: a4f617f451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071330

Change-Id: Id5821cce58edce608a9eb8d38d8001c2196d4b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:46:45 +00:00
Prabir Pradhan
06a838b187 Merge "Ensure handwriting session can only be started from inside app bounds" into tm-dev am: a4f617f451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071330

Change-Id: I1c1c6d919286fb01648e0167993c4e5cb1b8ce37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:46:07 +00:00
Andy Hung
6a1b6bc9da Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev 2022-03-28 19:43:21 +00:00
Yuri Lin
1a9c4a2a3d Merge "Write ZenPolicy conversation settings out to XML" into tm-dev 2022-03-28 19:41:22 +00:00
TreeHugger Robot
c037663623 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2ec1d951f9 -s ours am: b8d744f47e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icce70c9fc563a1b8e5437a019b76f976eb76aac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:28:07 +00:00
Vadim Caen
76155d7adc Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-dev am: 09f7f6f69b am: cca4bab205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17319805

Change-Id: I5785e677c4715f4b5d706012481deb186fd3dfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:27:17 +00:00
Andy Hung
bb9f2c915f Merge "SoundPool: Clean up JNI AudioAttribute handling" into tm-dev am: fdf11ed6f1 am: 043307a28f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260690

Change-Id: If7ffde8cc9d539d4137bbcc7d0aa2aa9974728a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 19:26:32 +00:00