Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,807 Commits 3 Branches 0 Tags
fe309678144e502a6deb33f3e284e000db677b5c
Commit Graph

654807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
fe30967814 [Provider Model] Show Wi-Fi icon with exclamation mark am: 29aedbe529 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611731

Change-Id: Ia7926ec40dc18549773ad11290afcd7af2f27911
 2021-08-25 09:01:37 +00:00
Zoey Chen
9f1e79fb4a [Provider Model] Apply the latest figma of Provider Model am: d4712ff999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611730

Change-Id: Ib3cf7446b015508c5d1777094c1a0b6b5e29b785
 2021-08-25 09:01:32 +00:00
Weng Su
373a043d09 [Provider Model] Show searching sub-title for 2 seconds am: 659b2885d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611729

Change-Id: I608158ddb4604b7ccf79bba734314fb444085a73
 2021-08-25 09:01:17 +00:00
Treehugger Robot
e11d931b2a Merge "Correct comments" am: 2c0b1b672e am: d6b4b6dc69 am: 7c4190ef37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784149

Change-Id: I9679baba1e0b82881f92796c196dc3590b18ed41
 2021-08-25 07:47:03 +00:00
Treehugger Robot
7c4190ef37 Merge "Correct comments" am: 2c0b1b672e am: d6b4b6dc69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784149

Change-Id: I594aaa568ba6743b45ab665f8e3e5dbb357f8323
 2021-08-25 07:31:45 +00:00
Treehugger Robot
d6b4b6dc69 Merge "Correct comments" am: 2c0b1b672e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784149

Change-Id: I3bc94fb7cbc33dc32bb4b0adf5282814bac75232
 2021-08-25 07:17:26 +00:00
Treehugger Robot
2c0b1b672e Merge "Correct comments" 2021-08-25 07:04:22 +00:00
Zoey Chen
ed410c03ac Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev am: c6691520b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611701

Change-Id: I089df1842cf4a4e33671f2be194321397c73dbab
 2021-08-25 06:19:35 +00:00
Zoey Chen
0313f9c68c [Provider Model] Cherry-pick from ag/15243691, ag/15287619, ag/15287620 and ag/15270751 am: 903f54b107 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580587

Change-Id: I15b31b46ff392d8c942783c7dc8cba8b3bd2222b
 2021-08-25 06:19:18 +00:00
Zoey Chen
c6691520b1 Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev 
* changes:
  Refactor InternetIconInjector to SettingsLib
  [Provider Model] Cherry-pick from ag/15243691, ag/15287619, ag/15287620 and ag/15270751
 2021-08-25 06:04:30 +00:00
Jooyung Han
8f1cfa2ae8 Merge "telephony: suppress warnings in AIDL" am: 89242df0c9 am: 05820c8ff6 am: f2e4340476 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796511

Change-Id: I2243d9cde081a9509daa9e85f13aa15bff78d833
 2021-08-25 05:26:43 +00:00
Jooyung Han
f2e4340476 Merge "telephony: suppress warnings in AIDL" am: 89242df0c9 am: 05820c8ff6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796511

Change-Id: I6db7eb683f8abfa9e39ad2f8b8a0e999f79eb141
 2021-08-25 05:14:50 +00:00
Jooyung Han
05820c8ff6 Merge "telephony: suppress warnings in AIDL" am: 89242df0c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796511

Change-Id: Id02daf502a31ee333ea368621f072efc07104323
 2021-08-25 05:03:06 +00:00
Zoey Chen
e2749c27a2 Merge "[Provider Model] Remove the flag of ProviderModel in InternetTile" into sc-qpr1-dev am: 50bdf2b540 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546423

Change-Id: I869e0974d3809b5f5d7a218c94af902ca5ee525d
 2021-08-25 04:54:21 +00:00
Jooyung Han
89242df0c9 Merge "telephony: suppress warnings in AIDL" 2021-08-25 04:51:37 +00:00
Zoey Chen
50bdf2b540 Merge "[Provider Model] Remove the flag of ProviderModel in InternetTile" into sc-qpr1-dev 2021-08-25 04:29:12 +00:00
Arthur Hung
0869676255 Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay" into sc-qpr1-dev am: 519749f60c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15659645

Change-Id: I186758d9a5fe39120e4419782ca7e78304eeee8e
 2021-08-25 02:42:35 +00:00
Arthur Hung
519749f60c Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay" into sc-qpr1-dev 2021-08-25 02:29:31 +00:00
Rhed Jao
7bf07cca59 [automerger skipped] Merge "Apply a maximum char count to the load label api" into sc-qpr1-dev am: a824612523 -s ours 
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 3c26a24644 is already in history

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

Change-Id: I97c2f8f042815357a80f3486698d507c9c94cc36
 2021-08-25 01:52:06 +00:00
Rhed Jao
a824612523 Merge "Apply a maximum char count to the load label api" into sc-qpr1-dev 2021-08-25 01:36:53 +00:00
Android Build Prod User
b6f895d6c4 Merge "Don't unregister doze sensors that have been requested" into sc-qpr1-dev am: 1f1ec17fdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15627249

Change-Id: I3a28e28619c86a5227f110faa211cf81dabcd6ba
 2021-08-25 00:16:55 +00:00
Android Build Prod User
1f1ec17fdc Merge "Don't unregister doze sensors that have been requested" into sc-qpr1-dev 2021-08-25 00:01:43 +00:00
Beverly Tai
677d7648b7 [automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 -s ours am: 311d0ebb18 -s ours 
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 822e07e0f4 is already in history

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

Change-Id: I9ef49c8a28e77b9ee29071bae36c4ba6c5762a03
 2021-08-24 22:32:40 +00:00
Android Build Prod User
ea53f4ff68 Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79 am: c4ff7892ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: I002d2599b5c3d38832caa501f1412e87281308e0
 2021-08-24 22:32:26 +00:00
Beverly Tai
0ee822a954 [automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 am: 99e25af04a -s ours 
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 822e07e0f4 is already in history

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

Change-Id: Ifa3fa62a459bb2ac90e93e66efb3d25ec49daec2
 2021-08-24 22:26:57 +00:00
Android Build Prod User
e6a3dd0f61 Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79 am: 003612073a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: I492fba013bc89e61ffcd9832306bb222f381a35c
 2021-08-24 22:26:45 +00:00
Beverly Tai
311d0ebb18 [automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 -s ours 
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 822e07e0f4 is already in history

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

Change-Id: I8139bf1b0e1245ac9fbb8dc4dcd697c6f88bac09
 2021-08-24 22:09:16 +00:00
Android Build Prod User
c4ff7892ab Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: Idb5738f197b90a92c813fba179a9e594f85d5740
 2021-08-24 22:09:10 +00:00
Beverly Tai
99e25af04a Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15661783

Change-Id: I3c984446de59a045b099d04d6becdc685832b1f2
 2021-08-24 22:08:50 +00:00
Android Build Prod User
003612073a Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: I312e80bb06e4bfbd878f6c2fd663fb7b104357db
 2021-08-24 22:08:20 +00:00
Beverly Tai
abfeb71406 Merge "Fix udfps flicker on camera launch + exit" into sc-dev 2021-08-24 22:04:27 +00:00
Android Build Prod User
0f2a769d79 Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev 2021-08-24 21:54:35 +00:00
Android Build Prod User
3d3a1ab4dd Merge "Fix udfps flicker on camera launch + exit" into sc-qpr1-dev am: b0a0874290 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15661877

Change-Id: I5d2538391fb06cc3d650fe1c0a7f6330246dc686
 2021-08-24 21:12:31 +00:00
Ady Abraham
67f4f1a0a5 Merge "DMS: Reduce the THRESHOLD_FOR_REFRESH_RATES_DIVIDERS" into sc-qpr1-dev am: 412b6dfe0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640930

Change-Id: I6392bf611b40d8726c0cdb6be9c3176c15d271f7
 2021-08-24 21:10:51 +00:00
Android Build Prod User
b0a0874290 Merge "Fix udfps flicker on camera launch + exit" into sc-qpr1-dev 2021-08-24 21:09:19 +00:00
Ady Abraham
412b6dfe0c Merge "DMS: Reduce the THRESHOLD_FOR_REFRESH_RATES_DIVIDERS" into sc-qpr1-dev 2021-08-24 20:50:33 +00:00
TreeHugger Robot
9f13ddc895 [automerger skipped] Merge "Fix key alias string comparison" into sc-qpr1-dev am: 1e1fa11538 -s ours 
am skip reason: Merged-In I2c5e47283eed5694951869e9ea3853364ddef9d1 with SHA-1 11cce949b6 is already in history

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

Change-Id: Icbaa1af0a46e697d561ad056f63535ccf4ebb4ad
 2021-08-24 20:31:52 +00:00
TreeHugger Robot
f844a42501 [automerger skipped] Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 am: 7ee7447166 -s ours 
am skip reason: Merged-In Iacd46b99c5a86c8f7a7706b91b0b78a3beb4c414 with SHA-1 c2dda240a7 is already in history

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

Change-Id: I8a75f721381535c10ea9db09a5452207606d0af4
 2021-08-24 20:31:39 +00:00
TreeHugger Robot
8b7144c25d Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 am: 72f4fcddc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15660797

Change-Id: Ief9cc333cbb724ed1a406cbf110528ef1e913616
 2021-08-24 20:31:25 +00:00
TreeHugger Robot
1e1fa11538 Merge "Fix key alias string comparison" into sc-qpr1-dev 2021-08-24 20:25:32 +00:00
TreeHugger Robot
7ee7447166 Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15660797

Change-Id: Ibb032b545c1379bbee40276891da23e0678aabe1
 2021-08-24 20:17:12 +00:00
TreeHugger Robot
72f4fcddc0 Merge "Fix flicker when unlocking the screen." into sc-dev am: 6431f95dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15660797

Change-Id: Ie773df49499e58152c777ea14b8d432a300d4512
 2021-08-24 20:15:51 +00:00
Jeff Sharkey
7d36b17cc4 Merge "Test mapping changes can be made by anyone." am: e4550434e5 am: 001460d8fb am: b849228b74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807605

Change-Id: I68967eb7e88af89827ab1b7ba346ece1c92d872c
 2021-08-24 20:12:54 +00:00
TreeHugger Robot
6431f95dc7 Merge "Fix flicker when unlocking the screen." into sc-dev 2021-08-24 19:59:12 +00:00
Jeff Sharkey
b849228b74 Merge "Test mapping changes can be made by anyone." am: e4550434e5 am: 001460d8fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807605

Change-Id: Iaf52135bbc46779bf78c6aaf749451192e06c6c3
 2021-08-24 19:52:58 +00:00
Jeff Sharkey
001460d8fb Merge "Test mapping changes can be made by anyone." am: e4550434e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807605

Change-Id: Iba21bc06b92a319c503250a5c06c010b1061bb92
 2021-08-24 19:35:21 +00:00
Jeff Sharkey
e4550434e5 Merge "Test mapping changes can be made by anyone." 2021-08-24 19:15:48 +00:00
Neha Jain
1dfc6b4373 Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 am: 5d29a96cab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: I71f35021878cd3e6e451276a9b8c3947f889847b
 2021-08-24 18:33:55 +00:00
Eric Laurent
4349882af3 Merge "Notification playback: pause on release" into sc-dev am: e198354a0c am: 1893dc2843 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15505426

Change-Id: I8921825bd23f27a25b3921a72523bdcbadc66feb
 2021-08-24 18:33:30 +00:00
Seth Moore
7098945314 Fix key alias string comparison 
The code was doing a reference compare, not object value comparison,
resulting in failures in the KeyStore setEntry API.

Test: CtsKeystoreTestCases:android.keystore.cts.AndroidKeyStoreTest
Bug: 197138784
Change-Id: I2c5e47283eed5694951869e9ea3853364ddef9d1
Merged-In: I2c5e47283eed5694951869e9ea3853364ddef9d1
 2021-08-24 11:26:02 -07:00