Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
646,552 Commits 3 Branches 0 Tags
047bba6aaa5ffe4dc4d318c46436d910a7065726
Commit Graph

646552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nazanin Bakhshi
047bba6aaa Merge "Revert "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED"" into sc-dev am: 65acc588ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14355547

Change-Id: If5ee40357bb0b93ef38029ffa00fced830318966
 2021-04-29 18:36:41 +00:00
Nazanin Bakhshi
65acc588ee Merge "Revert "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED"" into sc-dev 2021-04-29 18:31:13 +00:00
TreeHugger Robot
da52ab7cb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 86fb403551 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I126a4c770857a890fb11cc67590c9d4c0b55d121
 2021-04-29 18:29:07 +00:00
Daniel Santiago Rivera
7dd99d922d Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe am: 1cfbf3a69e am: b14134faf2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I98fe4e1b3a8e8ac4634aa86ac4d8ad0afdb05fee
 2021-04-29 18:28:58 +00:00
TreeHugger Robot
b889c57ccf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours am: a18e01b554 -s ours am: e548cadbc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8069c81a2c44001323f79e9808eda13c9f83854
 2021-04-29 18:28:42 +00:00
TreeHugger Robot
a7c9930d34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours am: 805d5813ac -s ours am: 6f8488d44a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68b2aa162f31409e0326e658fa8a85aff3066ac1
 2021-04-29 18:28:15 +00:00
TreeHugger Robot
86fb403551 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-29 18:26:55 +00:00
Nazanin Bakhshi
95807e9a98 Revert "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" 
Revert "Using PHYSICAL_CHANNEL_CONFIG to detect RRC state"

Revert submission 14254545-PPC_detect_RRC_state

Reason for revert: <crashing Phone app b/186763089>
Reverted Changes:
Idf8f8b419:Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORT...
I65f392084:Using PHYSICAL_CHANNEL_CONFIG to detect RRC state

Change-Id: I46ed100d2f0b081587181a4cef29c38f76caaf2d
 2021-04-29 18:16:11 +00:00
Daniel Santiago Rivera
b14134faf2 Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe am: 1cfbf3a69e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I15046e16677d49b795b8e845fd082c80c7d1cea7
 2021-04-29 18:14:31 +00:00
TreeHugger Robot
e548cadbc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours am: a18e01b554 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40d8cf0e1d6a30f34d4e4c0c1553e2c52a5b1bb5
 2021-04-29 18:13:57 +00:00
TreeHugger Robot
6f8488d44a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours am: 805d5813ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief9d87de9e3c97734491a89d8c60a177cfd23c5b
 2021-04-29 18:13:17 +00:00
Daniel Santiago Rivera
1cfbf3a69e Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I9ae5f4063db356c4bf70782db3492635e83daee4
 2021-04-29 18:11:41 +00:00
Curtis Belmonte
3252423970 Merge "Send AIDL face enrollment frame info to clients" into sc-dev am: c05b6dbe20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14121142

Change-Id: I3d9c86624029714a728bdbd14a98b8df69f3a8c4
 2021-04-29 18:03:43 +00:00
Bill Yi
a21a50294d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e346b367f2 -s ours am: 641437329b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a23e1c0fba1fb28119ec1aa0bb0aea54fb1c7db
 2021-04-29 18:03:24 +00:00
Curtis Belmonte
c05b6dbe20 Merge "Send AIDL face enrollment frame info to clients" into sc-dev 2021-04-29 17:58:28 +00:00
TreeHugger Robot
e29bb674b2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-29 17:57:22 +00:00
Chris Li
2480b1aaaf Merge "Move legacy split screen flicker tests for non-resizable to presubmit" into sc-dev am: f9c4ee1fd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14117547

Change-Id: I16bfdec7e33798577cc5740c9cd54bd7fa9084e8
 2021-04-29 17:55:52 +00:00
Bill Yi
641437329b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e346b367f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iede02600fb4c5e127896405c5946734415676688
 2021-04-29 17:55:46 +00:00
Chris Li
b6b19106c5 Merge "Determine whether to support activities in multi window (2/n)" into sc-dev am: 34eedf496e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14343779

Change-Id: I45557b8a152cc1a06adcf781e7e3bc4d41fc83d4
 2021-04-29 17:55:12 +00:00
Chris Li
f9c4ee1fd3 Merge "Move legacy split screen flicker tests for non-resizable to presubmit" into sc-dev 2021-04-29 17:49:15 +00:00
Chris Li
34eedf496e Merge "Determine whether to support activities in multi window (2/n)" into sc-dev 2021-04-29 17:48:50 +00:00
TreeHugger Robot
a18e01b554 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ef50365ba84344d686a6f5de7bc96e900005314
 2021-04-29 17:47:52 +00:00
Lucas Dupin
40738f5916 Merge "Close QS Detail before hiding QS." into sc-dev am: 43c67441e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14342216

Change-Id: I84cc66f1d5a802bf5e8ecde570b793a75b659bb4
 2021-04-29 17:47:23 +00:00
TreeHugger Robot
805d5813ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a98eab00e305877c63390de15c37af4d464162e
 2021-04-29 17:46:55 +00:00
Bill Yi
41b249f862 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-29 17:39:57 +00:00
Lucas Dupin
43c67441e0 Merge "Close QS Detail before hiding QS." into sc-dev 2021-04-29 17:38:53 +00:00
Daniel Santiago Rivera
e40b2193fe Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I6df7f027d41fada91f46873a4bdafae1b5e88cbc
 2021-04-29 17:38:43 +00:00
TreeHugger Robot
8c3a3602b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-29 17:31:46 +00:00
Silin Huang
f1de6ecc93 Merge "WalletTile should display the default card of wallet." into sc-dev am: 3061389c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14324210

Change-Id: I87e68ff6a81e70a8c95db94d4e5b1c3263f84790
 2021-04-29 17:30:49 +00:00
Silin Huang
3061389c46 Merge "WalletTile should display the default card of wallet." into sc-dev 2021-04-29 17:24:39 +00:00
Brad Ebinger
5fcdd639de Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 am: 1286675083 am: 06674f21c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I40da0d6828d35a44625373407ccc3ead89d4eb14
 2021-04-29 17:23:59 +00:00
Bill Yi
635c601ece [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours am: ac18886190 -s ours am: bb0a4b1fb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98e5b155f5aaedc1020df38a006010554418e0dd
 2021-04-29 17:23:36 +00:00
Bill Yi
4b99a167d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26cbdaa84b -s ours am: b92255196d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6eb9919425499f36eab56bc63d4205178e8a7873
 2021-04-29 17:23:27 +00:00
Matt Pietal
b714914fde Merge "Smartspace - Check sensitivity settings" into sc-dev am: 4e65112c4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14329345

Change-Id: Ic3ebd723ba8288b0db19d047757bf26234750ef2
 2021-04-29 17:22:33 +00:00
Bill Yi
e346b367f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-29 17:21:26 +00:00
Brad Ebinger
06674f21c2 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 am: 1286675083 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I50795bb895c98fe105ee4a891ab72a2d9776109d
 2021-04-29 17:16:25 +00:00
Bill Yi
bb0a4b1fb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours am: ac18886190 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb553b8e1d279ae66707abcb44928f36c980ed3a
 2021-04-29 17:15:59 +00:00
Bill Yi
b92255196d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26cbdaa84b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f0bd41ccbada03cff89d020fee28ed43b107b6a
 2021-04-29 17:15:33 +00:00
Matt Pietal
4e65112c4f Merge "Smartspace - Check sensitivity settings" into sc-dev 2021-04-29 17:14:56 +00:00
TreeHugger Robot
35615bd603 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-29 17:13:54 +00:00
Ying Xu
1eeff3f75a Merge "Mock the makeCopy() method in the unit test" into sc-dev am: 1ce4cdb8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14343768

Change-Id: I446baf5c73c9fb4a832eabbddf5167b8a8faab23
 2021-04-29 17:07:50 +00:00
Dmitri Plotnikov
7d0edaf614 Merge "Fix mismatch between measured energy value for GNSS" into sc-dev am: cfe7c4f19b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344089

Change-Id: I795d9dfc55bbb4f3e4161e91d854b7fdd1e9e483
 2021-04-29 17:07:36 +00:00
Mihai Niță
bd52a2f28e Merge "Update Android language picker with all eligible languages" into sc-dev am: 0df2fb42d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14298926

Change-Id: Ida41f893d5be2336e081c8e7202f888d7346296f
 2021-04-29 17:07:17 +00:00
Evan Rosky
6ea0542424 Merge "Adapt transition merge during recents into onTaskAppeared." into sc-dev am: aadebf0a38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14297820

Change-Id: Ib07681dd19925d8a211deeae0167ecc61b48c869
 2021-04-29 17:06:48 +00:00
Brad Ebinger
1286675083 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I19af2165d5e6e50c37596b2b0aed7f4092334379
 2021-04-29 17:06:20 +00:00
Garfield Tan
e4fb183870 Merge "Add Dimmer to RootDisplayArea" into sc-dev am: efc43e9003 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14332880

Change-Id: Iffc4cb8a41107dc4f285d4c814638deb3a015cc5
 2021-04-29 17:06:12 +00:00
Ying Xu
1ce4cdb8ff Merge "Mock the makeCopy() method in the unit test" into sc-dev 2021-04-29 17:02:14 +00:00
Daniel Santiago Rivera
2a2aa6d3c5 Merge "Added SQLite versions used on API levels 28, 30 and 31." 2021-04-29 17:00:01 +00:00
Bill Yi
ac18886190 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie59c293266e86c840c172bca4915df55ed99ae3b
 2021-04-29 16:57:57 +00:00
Dmitri Plotnikov
cfe7c4f19b Merge "Fix mismatch between measured energy value for GNSS" into sc-dev 2021-04-29 16:56:29 +00:00