drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,335 Commits 1 Branch 0 Tags
Commit Graph

653335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2e95d0be8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice118db3b140053137bc8ea0117f20ac891e3227
 2021-08-10 20:13:59 +00:00
Dave Mankoff
826e38be42 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Iedefd042d0ced95d7d2da35cfb351949cae13e25
 2021-08-10 20:03:52 +00:00
Dave Mankoff
4bd029298a [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I1c078ba951483d8b2dec5e52b0de71077852836c
 2021-08-10 20:03:32 +00:00
TreeHugger Robot
d99229c409 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours am: 3569f162e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I188504dc3b0c64cd9fb2bafae9fbe1dc7ffba3f7
 2021-08-10 19:56:41 +00:00
TreeHugger Robot
1b47d90b57 Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503759

Change-Id: I9fa9e7cc95faf1d3835c2a5e97563798a87a03f3
 2021-08-10 19:54:36 +00:00
TreeHugger Robot
3569f162e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9e4c9614ce42b6807695de56907a9edf13b3ae1
 2021-08-10 19:48:52 +00:00
Dave Mankoff
da9baed374 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Idd16d3824639191b81394377ae3e945eaea725f7
 2021-08-10 19:48:40 +00:00
Dave Mankoff
4b8f7a7991 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: If2aedea5dd07a0934d4de73ec429e0245e795ef0
 2021-08-10 19:48:35 +00:00
Dave Mankoff
dab8365333 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Ia4ff6e30e2563161e5746e3a649dfcbf5945842c
 2021-08-10 19:48:08 +00:00
TreeHugger Robot
30a5f7a877 Merge "Reduce height of expanded media controls" into sc-dev 2021-08-10 19:48:02 +00:00
Dave Mankoff
be89b2aa43 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I6379095c8cc4f938b9a28b6cd4952778898032c6
 2021-08-10 19:48:00 +00:00
TreeHugger Robot
7ef3d6ca95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours am: d3db1ee81a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc74a0b9246c7e08acadb95e8528add38c9eea79
 2021-08-10 19:43:19 +00:00
TreeHugger Robot
d3db1ee81a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73fb19ed69289508599d138c5178405f924406a0
 2021-08-10 19:38:50 +00:00
TreeHugger Robot
93e0c269af Merge "Update udfps AOD icon" into sc-dev am: fbf9a2634c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15500384

Change-Id: Ib0ee59d3852f026e5270b396f2e0d7c449c479d7
 2021-08-10 19:32:49 +00:00
TreeHugger Robot
07a2913428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46da446809 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1935fa0a2f34edeb07dcf7d210902559b5c3bcd
 2021-08-10 19:32:42 +00:00
TreeHugger Robot
df74ed8fe6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e73216a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id76fbb918a928b7a8fb459880d5ab51a351d077a
 2021-08-10 19:32:28 +00:00
TreeHugger Robot
79405cd9d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8dd449cee4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59c676efc57a7bebe1fae0ae524dd72a10a24dc0
 2021-08-10 19:32:16 +00:00
TreeHugger Robot
52b1ce3c9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d9c0e6992d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I643e2c1826f28029f3ba970dab968747923bbccf
 2021-08-10 19:32:02 +00:00
TreeHugger Robot
64557dfbde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff33c17f8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32ca9ff4628f82cf11cae853cab4ecf25d012ca8
 2021-08-10 19:31:51 +00:00
TreeHugger Robot
ad6e40f073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c653 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibcc1ccbe2942758f5ea785c0be6b9bcb1e132974
 2021-08-10 19:31:38 +00:00
Dave Mankoff
804799ae8a [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: If3dd19e9e31586eb5e63c87045016f8aa17c4a1b
 2021-08-10 19:31:18 +00:00
TreeHugger Robot
c56c5cf2d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edd4b154f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica2147e36b4f1d4bb25a394706b459c60010def0
 2021-08-10 19:31:13 +00:00
Dave Mankoff
5a382b6915 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I5456f1058281600aa81241000d2a5e8530815126
 2021-08-10 19:31:00 +00:00
TreeHugger Robot
fbf9a2634c Merge "Update udfps AOD icon" into sc-dev 2021-08-10 19:28:48 +00:00
TreeHugger Robot
46da446809 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:25:50 +00:00
TreeHugger Robot
177e73216a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:24:14 +00:00
TreeHugger Robot
8dd449cee4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:24:11 +00:00
TreeHugger Robot
262de4fb4f Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:24:09 +00:00
TreeHugger Robot
5f7ad43cdf Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:23:56 +00:00
TreeHugger Robot
d9c0e6992d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:23:53 +00:00
TreeHugger Robot
ff33c17f8e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:23:47 +00:00
TreeHugger Robot
0421f6c653 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:23:44 +00:00
TreeHugger Robot
40cb9ed9c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:23:24 +00:00
TreeHugger Robot
0cab7eb1f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:20:49 +00:00
TreeHugger Robot
edd4b154f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:20:06 +00:00
TreeHugger Robot
a319964f46 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:19:24 +00:00
Dave Mankoff
6db47d2d58 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I31df5dd17183ecaf75a8ee8c0a64b201dc29992b
 2021-08-10 19:19:20 +00:00
Dave Mankoff
47d2f291e3 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I2ae8d9dadf42dea7071e2ac23f00d4ed3333660d
 2021-08-10 19:11:47 +00:00
Dave Mankoff
0122320cb2 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519

Change-Id: Ic923b993f8bff5b5fa2c5f32f91e4787b8c21e18
 2021-08-10 19:11:11 +00:00
Treehugger Robot
811de5db8c Merge "Add new API to notify CallRedirectionService timed out." am: 5a5c3d7562 am: 423dd00f7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782287

Change-Id: I44f952574d81b1ce6cc8d0f1c1e82d638c7fc558
 2021-08-10 19:07:40 +00:00
Dave Mankoff
15336c87fa Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev 2021-08-10 18:58:52 +00:00
Dave Mankoff
b279744b70 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev 2021-08-10 18:58:36 +00:00
Treehugger Robot
423dd00f7f Merge "Add new API to notify CallRedirectionService timed out." am: 5a5c3d7562 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782287

Change-Id: I8eeb95915b9b8f7dd66bf0e9bc16b0333f09b77b
 2021-08-10 18:50:25 +00:00
TreeHugger Robot
a94ecb5baa Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517616

Change-Id: I1d399457af3deecec1993feef739f0236c72d12e
 2021-08-10 18:50:11 +00:00
Joe Bolinger
d93392c4d2 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969bf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15505425

Change-Id: I69f68b87fdf4086e4a7587e8f485f659c377be14
 2021-08-10 18:49:44 +00:00
Treehugger Robot
5a5c3d7562 Merge "Add new API to notify CallRedirectionService timed out." 2021-08-10 18:38:14 +00:00
TreeHugger Robot
35260c6f60 Merge "Log locations received by default and add javadocs" into sc-dev 2021-08-10 18:38:06 +00:00
Joe Bolinger
9259969bf2 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev 2021-08-10 18:36:46 +00:00
Yi Jiang
8bdf84b040 Merge "Reduces the timeout of rotation memeorization." into sc-dev am: 99f8b533c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481637

Change-Id: Ic44be5dd74270d2fce0e20480ba93d20224e002e
 2021-08-10 18:14:45 +00:00
Yi Jiang
99f8b533c7 Merge "Reduces the timeout of rotation memeorization." into sc-dev 2021-08-10 18:01:40 +00:00