Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
658,422 Commits 3 Branches 0 Tags
3a9eb555b8616b4b9c2d399d8b830dae7a9716d8
Commit Graph

658422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3a9eb555b8 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: 2f64defeb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I3f48e29dd60b6aa2a7bb4fb7e26d73553116c758
 2021-09-30 00:36:35 +00:00
TreeHugger Robot
2f64defeb4 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: If5443a8c72311fe58f8bc75164a9c3f4da3861a2
 2021-09-30 00:23:13 +00:00
TreeHugger Robot
c46a977d82 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I9030e8cced0b2b9879b377d9f3e62aed50022ccb
 2021-09-30 00:11:52 +00:00
Suprabh Shukla
fefc7f08be Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af am: 23315f8003 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: I207038219be0fdbd84454a8c8d1cce3b052f8a12
 2021-09-30 00:11:45 +00:00
TreeHugger Robot
3cd4616abe Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev am: e9226e8f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15905687

Change-Id: I0739d826b5250deb9a35b0b44de45b106318ac06
 2021-09-30 00:04:10 +00:00
TreeHugger Robot
8e954f6a82 Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev am: 94eecf4e07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878932

Change-Id: I22115bcd70f730cc174ed858368bbcbf15b117d5
 2021-09-30 00:03:18 +00:00
TreeHugger Robot
c2c72dae24 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev 2021-09-30 00:01:09 +00:00
Suprabh Shukla
23315f8003 Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: I501853427878fa4ea0e227ec1b00ac7c831b5291
 2021-09-29 23:59:17 +00:00
TreeHugger Robot
e9226e8f46 Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev 2021-09-29 23:58:52 +00:00
TreeHugger Robot
94eecf4e07 Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev 2021-09-29 23:49:38 +00:00
Suprabh Shukla
694cf0f6af Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: Iea902e93f038cd3a06d63cf6c6cdd149c873df79
 2021-09-29 23:39:49 +00:00
Suprabh Shukla
17a7d79ff4 Merge "Redact key value from log when DEBUG is false" 2021-09-29 23:25:21 +00:00
Lucas Dupin
ef35ff2146 Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303

Change-Id: I59138d29458b23ad980ac5a8418cc168e3c50d4d
 2021-09-29 21:54:12 +00:00
Lucas Dupin
48647682a0 Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev 2021-09-29 21:38:53 +00:00
Brad Ebinger
48942a0a6c Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc am: b26396ab94 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: I8fcf0b9e866840486cd409d67bdcdb6036379546
 2021-09-29 19:15:10 +00:00
Brad Ebinger
b26396ab94 Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: Icd10f46cfaa00ff940a82d54e4cde2d283930a5f
 2021-09-29 18:45:11 +00:00
Automerger Merge Worker
27ffbed7f8 Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours" into sc-qpr1-dev-plus-aosp 2021-09-29 18:41:13 +00:00
TreeHugger Robot
258a30ee51 [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours 
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: Idf8bba938b244e016bdd1f674a6c737e86611466
 2021-09-29 18:40:44 +00:00
Long Ling
1730e32644 [automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours 
am skip reason: Merged-In I37b5b05a363a3d4f2ed3626109206863b664ba66 with SHA-1 f1b1ef1c38 is already in history

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

Change-Id: I3c2ac19da865619f7cdc8cfc4bd2cd1d24ace380
 2021-09-29 18:40:42 +00:00
TreeHugger Robot
bf1303a375 [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours 
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: I7b6756de3c4a78be4711a8e0e52abcafe4a130b2
 2021-09-29 18:40:33 +00:00
Brad Ebinger
e211df78dc Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: I00bf7a8ddc67cd819e16776b9ec62bfe72bb3db6
 2021-09-29 18:31:25 +00:00
TreeHugger Robot
17a68e2bb4 Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150

Change-Id: I20efb6ef7a517c11feef94fd8d7c06ad59f5a33a
 2021-09-29 18:27:09 +00:00
Long Ling
18188ea718 Limit refresh rates if skin temperature is high am: 7e783bb071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15911112

Change-Id: If5d474577f9492ee64e69deec9e56eaba92e6496
 2021-09-29 18:27:00 +00:00
TreeHugger Robot
de460d153e [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours 
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: Iceeb1fe625be569c275a8c570daa42766c481e9f
 2021-09-29 18:25:09 +00:00
Brad Ebinger
6a5e594515 Merge "Add a device overlay for radio off delay due to IMS deregistration" 2021-09-29 18:15:58 +00:00
TreeHugger Robot
7b3e40dd63 Merge changes from topic "b196691596" into sc-dev 
* changes:
  Separate refresh rate restrictions for different High Brightness Modes
  Limit refresh rates if skin temperature is high
 2021-09-29 18:11:42 +00:00
Bill Yi
a48f918f95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 2683d9d782 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc97fb1ec342ec79b2b63ec8f2465170eaa6a643
 2021-09-29 17:35:03 +00:00
Bill Yi
06fbe9fb3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: 56a79c9676 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieebaaa2323593d03dec9c60a86c4969793908f73
 2021-09-29 17:34:56 +00:00
Bill Yi
8067d21b87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 5fe5b29efd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32a072137c288bf40eabee3e9934f3bc45462165
 2021-09-29 17:26:28 +00:00
Bill Yi
3504ff389f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: de186d7ee7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib72e6044a667bfd710b4da68267e8802db1e17c6
 2021-09-29 17:26:20 +00:00
Bill Yi
4d1228138b Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev am: 80474f4697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: Ib8338b505c89004a74a262ede98b8e547737d58b
 2021-09-29 17:26:04 +00:00
Bill Yi
07b9fe79ad [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: 6f51b6d2bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c2cef8937a8065360deef96638d281d0d5e8a74
 2021-09-29 17:25:59 +00:00
Bill Yi
2dc674139d Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd46c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: Ib53c605abccaa97a272f88f50dc9dc600e4c6ef8
 2021-09-29 17:25:12 +00:00
Bill Yi
fe3dd2b7bb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: 62323d8c9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a265b02fad723f9214ffc9861b43be4b012859f
 2021-09-29 17:25:06 +00:00
Bill Yi
99669a9da9 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: I80c8c8bb7fd5fd376e9330cf7f5db4e69cc66e35
 2021-09-29 17:24:28 +00:00
Bill Yi
00d5c23e54 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: d273e87d18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13e1f12630f2432b420b2851742c6adff0893b35
 2021-09-29 17:24:23 +00:00
Bill Yi
5fe5b29efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c08835b045cde1e7d823fbfbf8de5d555526a0a
 2021-09-29 17:23:19 +00:00
Bill Yi
de186d7ee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If665263929a6748b3690c5326a6aaa4cb4f47d57
 2021-09-29 17:23:11 +00:00
Bill Yi
2683d9d782 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8587ba2195354fc3e8e43de3045c8358dc36fdc0
 2021-09-29 17:22:45 +00:00
Bill Yi
56a79c9676 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If744b7c0d0122bac42d4f7db70a6ca1026beb4b4
 2021-09-29 17:22:06 +00:00
Bill Yi
7c7eef4bdb Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-dev-plus-aosp am: d919594781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: I43ebad50f80757296be3074a2fb83239b82409b7
 2021-09-29 17:15:06 +00:00
Bill Yi
d51c97bcbd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: dd2408bfe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibece07dc2c0cc3ba658eec39e7d18a6ae3dc5345
 2021-09-29 17:14:57 +00:00
Bill Yi
80ac314d9d Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-dev-plus-aosp am: 2bced2c85f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: Id611dfe23065ad49688067854f6f246dd66aeaa7
 2021-09-29 17:14:19 +00:00
Bill Yi
176150c158 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: a04424c5e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0472c6b378212bee26deade5d9f715011d6a857d
 2021-09-29 17:14:17 +00:00
Bill Yi
6f1207b997 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-dev-plus-aosp am: c64feab371 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: I3b312794c98c004203d0eb8da8ab7f80c151601d
 2021-09-29 17:13:29 +00:00
Bill Yi
ac1e36b59f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: 7351941662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f1913a66dfc6fa1817f74520ffa8542ee931373
 2021-09-29 17:13:20 +00:00
TreeHugger Robot
d0bfa4c226 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: I151133e723e08ae9bb222970f5ffd81fc9880cd3
 2021-09-29 17:12:59 +00:00
Bill Yi
b0cde68ecf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-29 17:09:50 +00:00
Bill Yi
80474f4697 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:09:50 +00:00
Bill Yi
d919594781 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:09:50 +00:00