Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
497,105 Commits 3 Branches 0 Tags
7359977be749a5c09ad83f59ff1c268247f5ac9d
Commit Graph

497105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7359977be7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I675c51614b7caad1ac49d1444d32d6f610035839
 2020-12-09 08:52:02 -08:00
Songchun Fan
190d57124c Merge "[SettingsProvider] fix font size scale validator" into rvc-qpr-dev 2020-12-09 00:00:24 +00:00
TreeHugger Robot
33229d78b6 Merge "AudioService: increase audio mode timeout." into rvc-qpr-dev 2020-12-08 20:54:28 +00:00
Cody Kesting
07dd48319d Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev 2020-12-08 19:31:46 +00:00
Ming-Shin Lu
132a346318 Merge "Revert "Ignore to show splash screen if the decorView is not opaque"" into rvc-qpr-dev 2020-12-08 14:08:54 +00:00
Eric Laurent
dcf6982790 AudioService: increase audio mode timeout. 
Increase audio mode timeout from 3 seconds to 6 seconds
to leave more time for VoIP apps to connect the call after
setting the audio mode.

Bug: 174714082
Test: repro steps in the bug
Change-Id: Ic1efc496931a5ab5fb9a28fc918dba1cf66a89df
Merged-In: Ic1efc496931a5ab5fb9a28fc918dba1cf66a89df
 2020-12-08 08:43:24 +00:00
tim peng
7de579f1ce Merge changes from topic "media_output_dialog" into rvc-qpr-dev 
* changes:
  Apply animation for Media Ouput Switcher dialog
  Add dynamic item in output switcher if it is available
  Fix NPE when notification icon is empty
  Fix output switcher didn't show album art
  Add dynamic group operation in output switcher
  Enhancement for group operation in output switcher
  Add dismiss timing for Media Output Dialog
  Update OutputSwitcher from SettingsPanel to MediaOutputDialog in SystemUI
  Add constant for dismiss Settings panel
  Add animation when switching output device
  Add dismiss intent and method for MediaOutputDialog
  Add "Stop" button for remote device
  Add constant for dialog dismiss
  Rename MediaOutDialogReceiver to MediaOutputDialogReceiver
  Add getFeatures() for get device supporting features
  Add a receiver to launch Output Switcher dialog
  Add MediaOutputDialogFactory to create MediaOutputDialog
  Add Media Output Dialog for Output Switcher
  Add controller for Media operation
  Add MediaOutputAdapter for Media device list
  Define strings for output switcher dialog in SystemUI
  Add image utility methods
 2020-12-08 05:46:13 +00:00
Winson Chiu
73ba627363 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours am: 321aaa6e41 -s ours am: 8a7fc10c89 -s ours am: d5b3480c71 -s ours am: 95251a1b76 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f4c9a11af7092177db2a24fc70d423512c30b8d
 2020-12-08 04:47:31 +00:00
Winson Chiu
95251a1b76 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours am: 321aaa6e41 -s ours am: 8a7fc10c89 -s ours am: d5b3480c71 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf77f8f5d798cf23bdaa935b1737e4f327e1756c
 2020-12-08 04:27:37 +00:00
Winson Chiu
d5b3480c71 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours am: 321aaa6e41 -s ours am: 8a7fc10c89 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e9c5410f8ebfc7f1877f066e3dbb63ec8daf12b
 2020-12-08 04:01:47 +00:00
Winson Chiu
8a7fc10c89 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours am: 321aaa6e41 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab2caf4b5ad01179f5a9c458429a91403e4ea703
 2020-12-08 02:57:04 +00:00
Winson Chiu
321aaa6e41 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours am: b8cf8bdb03 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aa4e82efcc54ad85ff8cc4253baf34e8d7b12d1
 2020-12-08 02:27:17 +00:00
Winson Chiu
b8cf8bdb03 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours am: 2d22fe6eec -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64a068ccd312d66a480752097e4f05e1d3903bb7
 2020-12-08 02:07:47 +00:00
Winson Chiu
204ae74cc1 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours am: 4f4568795c -s ours am: c141682801 -s ours am: 31ba467a83 -s ours am: b53a4559f7 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33d298deb5cf55e09d30edbca00bda780c1c5e94
 2020-12-08 01:10:15 +00:00
Winson Chiu
1c80119aff [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours am: 8f769e1796 -s ours am: 530654b082 -s ours am: c22f684455 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7920146f29291baa5b9192bb2e255c694ac5594b
 2020-12-08 01:09:55 +00:00
Winson Chiu
b53a4559f7 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours am: 4f4568795c -s ours am: c141682801 -s ours am: 31ba467a83 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff2c0f3c452411fff8998cb582d9c79b5cfcde58
 2020-12-08 01:04:40 +00:00
Winson Chiu
c22f684455 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours am: 8f769e1796 -s ours am: 530654b082 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bb007d1b6a6f6fdfa5e7e4f40821c8d34370fb6
 2020-12-08 01:04:28 +00:00
Winson Chiu
8920e6098e [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev am: a2cee8fb7b -s ours am: fb6579ab0e -s ours am: a92820b434 -s ours am: e4f4a2803c -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f3b32a3fad89208273818be7a9d27041795abfd
 2020-12-08 01:04:16 +00:00
Winson Chiu
7043a3487e [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev am: 643416f8a3 -s ours am: 738a4e26c9 -s ours am: 5f4f719224 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 3ebeb4c490 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05cb489b450cfced5aa5efb279b43633fa13e9d5
 2020-12-08 01:04:07 +00:00
Winson Chiu
f3e40ede05 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7b9 am: 90cd62298f -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 3ebeb4c490 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I224096f325384d84110067c47090885b04c36c8e
 2020-12-08 01:03:57 +00:00
Winson Chiu
e4f4a2803c [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev am: a2cee8fb7b -s ours am: fb6579ab0e -s ours am: a92820b434 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ae7e5a5ca568bad62468514365e7d9e6de14d72
 2020-12-08 01:03:53 +00:00
Winson Chiu
2d22fe6eec [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I346236b82b70e9f4c72648b71b33e22fc1956bf0
 2020-12-08 01:03:38 +00:00
Winson Chiu
31ba467a83 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours am: 4f4568795c -s ours am: c141682801 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I243c7cde552d2848a1a7f4bea6e828e409328bcc
 2020-12-08 00:53:59 +00:00
Winson Chiu
530654b082 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours am: 8f769e1796 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9045e88b1bd30561861d62c36194efb23598de1
 2020-12-08 00:53:20 +00:00
Winson Chiu
c141682801 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours am: 4f4568795c -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida70c096a452507129050a8c282a561da60fff57
 2020-12-08 00:52:54 +00:00
Winson Chiu
8f769e1796 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I473aa8d1fe4791d9311ed732b6ffcc070f773e89
 2020-12-08 00:52:31 +00:00
Winson Chiu
a92820b434 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev am: a2cee8fb7b -s ours am: fb6579ab0e -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d990970b65592c51d87b203c36bed19e10d9194
 2020-12-08 00:52:30 +00:00
Winson Chiu
4f4568795c [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours am: b2dd5af43b -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dd66c59e491cbc85e5279a911eec8e539d0180c
 2020-12-08 00:46:42 +00:00
Winson Chiu
69eed6d337 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 0220a57ec5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9eb1410bc5afb447219ad31ccc83469d1e60bc3
 2020-12-08 00:46:30 +00:00
Winson Chiu
5f4f719224 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev am: 643416f8a3 -s ours am: 738a4e26c9 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 7dc064e9ed is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fd6a1fca19c04a035a35f7177849ef6ae1258ed
 2020-12-08 00:46:14 +00:00
Winson Chiu
b2dd5af43b [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce178e -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf84df185d39255c4f279831e5d34536edf5cfb6
 2020-12-08 00:46:05 +00:00
Winson Chiu
b070447e39 Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940358

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e138583f75173a4d785707fa5fa4320c986a1d2
 2020-12-08 00:46:04 +00:00
Winson Chiu
90cd62298f Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940363

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fe0f028a09bcc7c36635834046b6cd5d88d71e9
 2020-12-08 00:45:56 +00:00
Winson Chiu
fb6579ab0e [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev am: a2cee8fb7b -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 ebb4d67258 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I990f40a04c92f741e1e8209cd2acebf855298c8d
 2020-12-08 00:45:56 +00:00
Winson Chiu
738a4e26c9 [automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev am: 643416f8a3 -s ours 
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 7dc064e9ed is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b101c214ccf41dc46a87807f5946387b2f7eb57
 2020-12-08 00:45:44 +00:00
Winson Chiu
9109ce178e Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev 2020-12-08 00:26:44 +00:00
Winson Chiu
e9954e149f Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev 2020-12-08 00:26:38 +00:00
Winson Chiu
4837c8a971 Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev 2020-12-08 00:26:26 +00:00
Winson Chiu
643416f8a3 Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev 2020-12-08 00:26:01 +00:00
Winson Chiu
a2cee8fb7b Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-dev 2020-12-08 00:25:56 +00:00
Winson Chiu
5e971858b8 Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-qpr-dev 2020-12-08 00:25:50 +00:00
Winson Chiu
ca2d8ec7b9 Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev 2020-12-08 00:25:37 +00:00
TreeHugger Robot
9de814cdfb [automerger skipped] Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-dev am: 44c43c51a5 am: 2766aa919e -s ours 
am skip reason: Change-Id I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 4bbbfaa6ec is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0aa23fd3d3dd78d9d86441add17345e56475e024
 2020-12-07 22:18:51 +00:00
TreeHugger Robot
2766aa919e Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-dev am: 44c43c51a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12657847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24be127bc4af111f2436edc5e1a30fedaa5fc0e1
 2020-12-07 21:45:00 +00:00
TreeHugger Robot
44c43c51a5 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-dev 2020-12-07 21:21:50 +00:00
Diksha Gohlyan
2a1c2a7aba [automerger skipped] Merge "Add back enforceReadPermission for getmetadata" into qt-dev am: e8b7bb3071 -s ours am: 7ba2192d7b -s ours am: d2ae809765 -s ours am: 57c685e8c5 -s ours 
am skip reason: Change-Id I4f04f08f76d039196c2c67bac80d4a46ebec87f2 with SHA-1 c94646177c is in history

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

Change-Id: I346f2442adceddc3387a28862e27ad44927a77ee
 2020-12-07 18:47:57 +00:00
TreeHugger Robot
f4cf24c06b [automerger skipped] Merge changes from topic "fail-validation-q" into qt-qpr1-dev am: b467f2237e am: 0c2d876d69 am: 6b21e637bc -s ours 
am skip reason: Change-Id If840f35245c2d049401d0d2f6539fe8c4625151e with SHA-1 37daf1ba80 is in history

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

Change-Id: Id5f8814eccd39e6dec2382cb77d69fcec2d5ccab
 2020-12-07 18:47:42 +00:00
Mohammad Samiul Islam
f3e1ce7449 [automerger skipped] Clean up staged session data on validation failure am: 58432ac699 -s ours am: eac7e1eecc am: ef924c05a3 -s ours 
am skip reason: Change-Id Idd6597cd0d2dda34a8a7626b585401eeee39c31f with SHA-1 f54412183a is in history

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

Change-Id: Icad76f9b5793bf1b76e268d77ee184edf1c5e90f
 2020-12-07 18:47:35 +00:00
Diksha Gohlyan
57c685e8c5 [automerger skipped] Merge "Add back enforceReadPermission for getmetadata" into qt-dev am: e8b7bb3071 -s ours am: 7ba2192d7b -s ours am: d2ae809765 -s ours 
am skip reason: Change-Id I4f04f08f76d039196c2c67bac80d4a46ebec87f2 with SHA-1 c94646177c is in history

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

Change-Id: I0e88b57cd2d6cd6a4ac7b4184947f18547ee5844
 2020-12-07 18:47:15 +00:00
Wesley.CW Wang
30f92a367d Make AOD battery text field support BatteryDefender 
- Add overheat flag into BatteryStatus
 - Update AOD battery indication to support new state when BatteryDefender is enable
 Screenshot: https://screenshot.googleplex.com/BYyUYS7VGtyG3i7.png

Bug: 173080412
Test: atest SystemUITests:com.android.systemui.statusbar.KeyguardIndicationControllerTest
Merged-In: I74f32136ba034d2dea19f71e1e7cecc022cd9fa9
Change-Id: I9aee4e6408d762639818e7aac42a781f12cd69ff
 2020-12-07 18:31:30 +00:00