Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
be7217f958 [automerger skipped] Merge "Clean up old references to android.support in Activity and Fragment" am: 2f3b72b8ef am: 88df69af7a -s ours am: 498a8a1acb -s ours 
am skip reason: Change-Id Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa with SHA-1 5d681da22c is in history

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

Change-Id: I96943f03a40e00b48db9ec7e17a880df13d8f2a0
 2020-07-01 20:40:54 +00:00
Treehugger Robot
498a8a1acb [automerger skipped] Merge "Clean up old references to android.support in Activity and Fragment" am: 2f3b72b8ef am: 88df69af7a -s ours 
am skip reason: Change-Id Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa with SHA-1 5d681da22c is in history

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

Change-Id: I0dbb5ed0ee15d50a146a4bd20e64909daf7e9987
 2020-07-01 20:29:19 +00:00
Treehugger Robot
88df69af7a Merge "Clean up old references to android.support in Activity and Fragment" am: 2f3b72b8ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331883

Change-Id: I8d1bfc5759f272cd76addad11fe88fc986a1fd5a
 2020-07-01 20:16:45 +00:00
Nikita Dubrovsky
b1ad3b6800 Change cursor drag threshold from 30 to 45 degrees from vertical 
Bug: 158948887
Test: Manual and unit tests
  atest FrameworksCoreTests:EditorTouchStateTest
  atest FrameworksCoreTests:EditorCursorDragTest
Change-Id: I6b30c0d6ef9c93fd4fd6aae3004cd6965e9d7be4
 2020-07-01 13:14:19 -07:00
Treehugger Robot
02fc087d0d Merge "[iwlan] config for connection persistence support" am: ad5d879455 am: e29d6a6285 am: 5a48285b1a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350663

Change-Id: I0f52a6b9398a4d921c09b7e524b122f295efb689
 2020-07-01 20:08:35 +00:00
Treehugger Robot
2f3b72b8ef Merge "Clean up old references to android.support in Activity and Fragment" 2020-07-01 19:57:53 +00:00
Treehugger Robot
5a48285b1a Merge "[iwlan] config for connection persistence support" am: ad5d879455 am: e29d6a6285 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350663

Change-Id: I43c9234268d17bfaa870ef9a7774a727970541f8
 2020-07-01 19:55:17 +00:00
Treehugger Robot
e29d6a6285 Merge "[iwlan] config for connection persistence support" am: ad5d879455 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350663

Change-Id: Iddae67f19e16a6698441550eb296219133bc85eb
 2020-07-01 19:31:18 +00:00
Treehugger Robot
ad5d879455 Merge "[iwlan] config for connection persistence support" 2020-07-01 19:13:49 +00:00
Automerger Merge Worker
a362eaf81e Merge "Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 am: 0bf4463e8b" into rvc-d1-dev-plus-aosp 2020-07-01 18:41:27 +00:00
Automerger Merge Worker
ca56ffb1a9 Merge "Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 am: dddf25ee3f" into rvc-d1-dev-plus-aosp 2020-07-01 18:41:20 +00:00
Beth Thibodeau
5608d332be Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 am: 0bf4463e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052991

Change-Id: I4e9becf0ce7bdfc11937533219bcdd48ebbe2231
 2020-07-01 18:41:16 +00:00
Automerger Merge Worker
6201ad8ea3 Merge "Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d8401 am: e471179dab" into rvc-d1-dev-plus-aosp 2020-07-01 18:41:03 +00:00
Beth Thibodeau
7997438281 Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 am: dddf25ee3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052991

Change-Id: I4f0d1124791f324cc2a4ef7db5150a6cda4e1abe
 2020-07-01 18:40:59 +00:00
Alan Stokes
8ac3deb003 Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d8401 am: e471179dab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047567

Change-Id: I77a8edb53f897cbb86c7b0642c1a765d80fc0a57
 2020-07-01 18:40:51 +00:00
Alan Stokes
5fef26d59a Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d8401 am: 818db795b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047567

Change-Id: Ie76dc930e8b2f419acf7d4a729ef8f765df6836f
 2020-07-01 18:40:46 +00:00
Beth Thibodeau
dddf25ee3f Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052991

Change-Id: I4eb3134ce755b3ae2592ffc45e11de1fe212513b
 2020-07-01 18:29:23 +00:00
Beth Thibodeau
0bf4463e8b Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052991

Change-Id: Ib48fa3824a96ec96fca80e0f2d0edc47f373438e
 2020-07-01 18:29:19 +00:00
Alan Stokes
818db795b9 Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d8401 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047567

Change-Id: I60ab4074fed1c1c3c9d213963c2497abacae565a
 2020-07-01 18:28:53 +00:00
Alan Stokes
e471179dab Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d8401 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047567

Change-Id: I5318dc86181969d7a21d1a2265e953930dd8a4e2
 2020-07-01 18:28:46 +00:00
Lucas Dupin
078a5de17f Log keyguard transitions after biometrics 
Bug: 157630051
Test: logcat
Change-Id: I942336c0b5aff78582b0cf0dde71847fec0c73ad
 2020-07-01 11:26:20 -07:00
Hui Yu
bce0a3a416 Check PendingStartActivityUids in getAppStartModeLocked. 
While starting activity, WindowManager posts a runnable to DisplayThread to updateOomAdj.
The UidRecord update could be delayed.

In getAppStartModeLocked(), before checking UidRecord, check PendingStartActivityUids
 to determine if the uid is in foreground state.

Bug: 160213874
Test: Reproduce steps in b/160213874, launch GCA and take a photo immediately.
Change-Id: Ieb984d2f629d607abfbda89ca00f8785cf5923fd
 2020-07-01 11:25:46 -07:00
Beth Thibodeau
3c336c4b64 Merge "Add device info for filtered players" into rvc-dev 2020-07-01 18:21:47 +00:00
Alan Stokes
717f3d8401 Merge "Don't allow shell to spoof initiating package name." into rvc-dev 2020-07-01 18:11:54 +00:00
Tiger Huang
97c1b4a34b Apply the requested insets sources if possible 
If the client doesn't change the insets, we use the dispatched source.
In this way, the task snapshot can have the same insets as the client.

Fix: 152931762
Test: atest TaskSnapshotControllerTest
Change-Id: Ib0315ce0a8ab32e1c653eeed725fecccb54b3aa8
 2020-07-02 01:44:39 +08:00
Automerger Merge Worker
e56cf4ba54 Merge "Merge "Deliver hideInsets when target is removed" into rvc-dev am: bb6c1e09ad am: 553b71a5b2" into rvc-d1-dev-plus-aosp 2020-07-01 17:10:03 +00:00
TreeHugger Robot
33a3f7ec2d Merge "Deliver hideInsets when target is removed" into rvc-dev am: bb6c1e09ad am: 553b71a5b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12011265

Change-Id: I4662f5ad2d690eed35a02790bf0c4c4376b55a5f
 2020-07-01 17:09:47 +00:00
TreeHugger Robot
0869447e90 Merge "Deliver hideInsets when target is removed" into rvc-dev am: bb6c1e09ad am: 454aeee949 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12011265

Change-Id: Iff4f5d38d11daff718c165fca703d658bbad265b
 2020-07-01 17:09:41 +00:00
TreeHugger Robot
454aeee949 Merge "Deliver hideInsets when target is removed" into rvc-dev am: bb6c1e09ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12011265

Change-Id: Ic690589869754fbef778d9c3405989abbcc7f57a
 2020-07-01 17:00:07 +00:00
TreeHugger Robot
553b71a5b2 Merge "Deliver hideInsets when target is removed" into rvc-dev am: bb6c1e09ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12011265

Change-Id: Idd5ef36a92ca4440dc9be16e6ce98e1092572a38
 2020-07-01 16:59:13 +00:00
Shafik Nassar
04a1c4b70b Merge "Add atom for general external storage access stats" into rvc-dev am: b1951ee22d am: f62d71d5d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894164

Change-Id: Ia209bc0a417613abbfe8b0a09f3b8a9274a64dfc
 2020-07-01 16:52:09 +00:00
Automerger Merge Worker
1f87922b9e Merge "Merge "Add atom for general external storage access stats" into rvc-dev am: b1951ee22d am: 43275e95d5" into rvc-d1-dev-plus-aosp 2020-07-01 16:51:44 +00:00
Automerger Merge Worker
c27eecd16d Merge "Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 am: 8c7fa9de80" into rvc-d1-dev-plus-aosp 2020-07-01 16:51:35 +00:00
Shafik Nassar
f778e108db Merge "Add atom for general external storage access stats" into rvc-dev am: b1951ee22d am: 43275e95d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894164

Change-Id: I9099c73bece3f4643abbce5cb6a5996cca8019c4
 2020-07-01 16:51:35 +00:00
Mady Mellor
6a3f9562fd Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 am: 17b5e3d4ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037679

Change-Id: I940f8460114b01d097c013f906ce375e6f0be611
 2020-07-01 16:51:12 +00:00
Mady Mellor
d8a19338d3 Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 am: 8c7fa9de80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037679

Change-Id: Iad4768aebf9dc9b4ef76b3755508ee4a3aaa0832
 2020-07-01 16:51:05 +00:00
TreeHugger Robot
bb6c1e09ad Merge "Deliver hideInsets when target is removed" into rvc-dev 2020-07-01 16:48:19 +00:00
Shafik Nassar
f62d71d5d4 Merge "Add atom for general external storage access stats" into rvc-dev am: b1951ee22d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894164

Change-Id: Ic1fa3787b34d1d4073ed96d268cc7802ec5bde44
 2020-07-01 16:36:40 +00:00
Shafik Nassar
43275e95d5 Merge "Add atom for general external storage access stats" into rvc-dev am: b1951ee22d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894164

Change-Id: I8fe2721308efc9ebb019a9de0c8c27093c98b1ce
 2020-07-01 16:36:39 +00:00
Mady Mellor
8c7fa9de80 Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037679

Change-Id: I8252074649fbdbe1f7cb1ac0b611b82807a87b01
 2020-07-01 16:36:19 +00:00
Mady Mellor
17b5e3d4ae Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev am: 0e3d9d31a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037679

Change-Id: I5887b805f035a9986f9835924d50ea5ef73ef264
 2020-07-01 16:36:17 +00:00
Shafik Nassar
b1951ee22d Merge "Add atom for general external storage access stats" into rvc-dev 2020-07-01 16:24:18 +00:00
Glenn Kasten
4cf80ec611 Merge "Include what you use: <cutils/bitops.h> for popcount" am: 644015b732 am: b9379f26d3 am: 866d56789c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353065

Change-Id: I45ebf104c6a42fa4dc686e2610d30b91d82f4985
 2020-07-01 16:10:11 +00:00
Mady Mellor
0e3d9d31a2 Merge "Make sure PendingIntent cancel listener is unregistered" into rvc-dev 2020-07-01 16:09:29 +00:00
Beth Thibodeau
b421a49c01 Add device info for filtered players 
Following up on ag/12037671 - MediaDataFilter uses getData when the user
changes, to get a list of all their previous media controls, so we need to put
the device data back too

Test: atest MediaDataCombineLatestTest
Test: manual, switch users and see output chip has device info
Bug: 12037671
Change-Id: I28e2d15919978e84e3205d2ddccb5024e4010247
 2020-07-01 11:50:08 -04:00
Glenn Kasten
866d56789c Merge "Include what you use: <cutils/bitops.h> for popcount" am: 644015b732 am: b9379f26d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353065

Change-Id: I36077d8b84a3a8fe959c18d8f5e516e03303e3f6
 2020-07-01 15:49:31 +00:00
Josh Tsuji
a7424effb9 Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b am: 58295346d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047870

Change-Id: I5329a311e66072a6a6235f93c134f68d9994f861
 2020-07-01 15:44:35 +00:00
Josh Tsuji
318eae7442 Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b am: ed1fd6a0a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047870

Change-Id: Ib1403c576adcfb397bd220f6e658b52a32440317
 2020-07-01 15:43:40 +00:00
Glenn Kasten
b9379f26d3 Merge "Include what you use: <cutils/bitops.h> for popcount" am: 644015b732 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353065

Change-Id: Idb87055c3b32dca3ba5aef909625adf13b6b722a
 2020-07-01 15:37:26 +00:00
Josh Tsuji
ed1fd6a0a2 Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047870

Change-Id: I31711631faa2c788f3e308f20df6a395d2454d9c
 2020-07-01 15:26:23 +00:00