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

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Wei
430fcbba06 USB: Correct title bar notification am: c0162a74b9 am: 5402c211af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595

Change-Id: I047b440a40a7cc5a08764965ac10c07c5577a6dd
 2021-08-16 11:00:50 +00:00
James Wei
4f7f6fba23 USB: Correct title bar notification am: c0162a74b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595

Change-Id: I5c1606698ca17794051bf9a52ea19ee608ece70e
 2021-08-16 10:51:21 +00:00
James Wei
5402c211af USB: Correct title bar notification am: c0162a74b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595

Change-Id: Ic7c3f9e7929c6a6927f022a9a011bcbc20a69dd0
 2021-08-16 10:50:25 +00:00
James Wei
c0162a74b9 USB: Correct title bar notification 
Change notification in accordance with additional tethering support on NCM

Bug: 196240561
Test: Manual test: Switch USB tethering to and from MTP / Charge Only
Change-Id: I7a5e1d7066774d60c3ba7f453554dc3a25b0af69
 2021-08-16 17:13:47 +08:00
Yu-Ta Lu
b9d49aee1a Merge "Set CollapsingToolbar Title textColor" into sc-dev am: c9ce62c06b am: 01c0e57647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556995

Change-Id: I19db8f3f0dd1cb5923194dc3fca78c19a869098f
 2021-08-14 18:37:58 +00:00
Yu-Ta Lu
d76e9c7277 Merge "Set CollapsingToolbar Title textColor" into sc-dev am: c9ce62c06b am: 7b6e8b12f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556995

Change-Id: I576847363439d977bdd56d59f058a23612579c7f
 2021-08-14 18:37:37 +00:00
Yu-Ta Lu
01c0e57647 Merge "Set CollapsingToolbar Title textColor" into sc-dev am: c9ce62c06b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556995

Change-Id: I52b2570bed6d7e9b24955528d4222e3707e01b05
 2021-08-14 18:22:55 +00:00
Yu-Ta Lu
7b6e8b12f4 Merge "Set CollapsingToolbar Title textColor" into sc-dev am: c9ce62c06b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556995

Change-Id: I93086358510e154b23c10641832bde1a9a00557e
 2021-08-14 18:22:28 +00:00
Yu-Ta Lu
c9ce62c06b Merge "Set CollapsingToolbar Title textColor" into sc-dev 2021-08-14 18:12:06 +00:00
Xin Li
773a9dfba7 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
Change-Id: I16482b494ff4821016aabbb646e495d616c630ac
 2021-08-14 07:23:27 +00:00
Treehugger Robot
08ff676ece Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" am: efc036801c am: f3da868dad am: 13f995456c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794807

Change-Id: I6a8958fac5106ebf6b42f9f881da6d6f48ee66f3
 2021-08-14 06:09:59 +00:00
Treehugger Robot
13f995456c Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" am: efc036801c am: f3da868dad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794807

Change-Id: I07e4d69f44b939dc49b02f14e0db2863556a8467
 2021-08-14 05:50:16 +00:00
Treehugger Robot
f3da868dad Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" am: efc036801c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794807

Change-Id: Id19fa4dc6ca62339315652f98a6d66f12dbff51c
 2021-08-14 05:27:00 +00:00
Treehugger Robot
efc036801c Merge "Keystore 2.0 SPI: Fix contract between equals and hashCode" 2021-08-14 05:07:21 +00:00
Milton Wu
260baf0310 Merge "Add non-system overlay flag for usb perm dialog" into sc-qpr1-dev am: 9c58022d6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556998

Change-Id: I827d53060f934c16322906fb0afba3732d744eab
 2021-08-14 04:03:36 +00:00
Joe Bolinger
4f9d864e2b Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da54 am: 8d74548cba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15564960

Change-Id: I5297cb7b6f34f54fe21b506b0c8cafcda05cce2c
 2021-08-14 04:03:12 +00:00
Joe Bolinger
c11e005db5 Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da54 am: 8059de7fdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15564960

Change-Id: I2ba217fc3796f6117571867cc0c3b39dd74d4fb4
 2021-08-14 04:02:47 +00:00
Milton Wu
9c58022d6b Merge "Add non-system overlay flag for usb perm dialog" into sc-qpr1-dev 2021-08-14 03:56:11 +00:00
Joe Bolinger
8d74548cba Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15564960

Change-Id: Idf80a4a7f232b524ae75fa223d17b910a37380cc
 2021-08-14 03:52:27 +00:00
Joe Bolinger
8059de7fdb Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15564960

Change-Id: Ia336741ce686f1a548712d111f23b68336c7d784
 2021-08-14 03:51:10 +00:00
Mill Chen
23dd0bd4a1 Set CollapsingToolbar Title textColor 
The original title color seems to be set incorrectly for all OEM
devices except for Pixel. This change stabilizes the color.

Bug: 196106314
Bug: 196614394
Test: manual test
Change-Id: I2b9f7ddec17d1d447cb7348e8f96cabb81e2e229
 2021-08-14 03:48:12 +00:00
Joe Bolinger
922fe0da54 Merge "Add a generic error message for missing vendor error strings." into sc-dev 2021-08-14 03:30:22 +00:00
Jeff DeCew
e30260aa9a Merge "Collapse the CallStyle buttons to just an icon instead of truncating text." into sc-qpr1-dev am: 44527690ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559241

Change-Id: Ib93a57b8bd4e2158f2edbd87a552de2db49d8032
 2021-08-14 02:17:17 +00:00
TreeHugger Robot
11b0191829 Merge "Log failures to unlinkToDeath wakelocks." into sc-dev am: 0fa71fccb5 am: ab26c9e03f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259610

Change-Id: I27f2df40c3c258ffa6440fe4aeb0b990cc7043cf
 2021-08-14 02:17:06 +00:00
TreeHugger Robot
1ab658a0f9 Merge "Log failures to unlinkToDeath wakelocks." into sc-dev am: 0fa71fccb5 am: 014fe316f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259610

Change-Id: If14d783e174120866e04ab01b3521ec1e79dc176
 2021-08-14 02:16:10 +00:00
Jeff DeCew
44527690ed Merge "Collapse the CallStyle buttons to just an icon instead of truncating text." into sc-qpr1-dev 2021-08-14 02:13:33 +00:00
TreeHugger Robot
ab26c9e03f Merge "Log failures to unlinkToDeath wakelocks." into sc-dev am: 0fa71fccb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259610

Change-Id: I482de4133a08cb1bec3e5f5baf30fac1ed3dd4ac
 2021-08-14 02:00:20 +00:00
TreeHugger Robot
014fe316f8 Merge "Log failures to unlinkToDeath wakelocks." into sc-dev am: 0fa71fccb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259610

Change-Id: I3bcd4efb6a5f3ed91cedb15b508e47c24c454400
 2021-08-14 01:59:17 +00:00
TreeHugger Robot
0fa71fccb5 Merge "Log failures to unlinkToDeath wakelocks." into sc-dev 2021-08-14 01:42:41 +00:00
Treehugger Robot
58d5a7b6e0 Merge "Allow SHELL_UID to disable Bluetooth for testing" am: 4c462beeae am: 461ea8ce30 am: 9119471001 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796128

Change-Id: I6b10b36dff4278873dcb01b19c635a06eda5207f
 2021-08-14 01:27:50 +00:00
Ray Essick
a0ead7cc42 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours am: ddaf6b4117 -s ours am: 4789a09476 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: Ib59633e53211e7307fb97ee8f9291b3b33646fd0
 2021-08-14 01:27:40 +00:00
Treehugger Robot
9119471001 Merge "Allow SHELL_UID to disable Bluetooth for testing" am: 4c462beeae am: 461ea8ce30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796128

Change-Id: I31791df5deb80a405458ac0f9ae38f59e72fb721
 2021-08-14 01:27:15 +00:00
Ray Essick
b45e3ebf51 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours am: ddaf6b4117 -s ours am: a9da270159 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: I79404d1a3201876a16a346204f831bea813a5ac0
 2021-08-14 01:15:57 +00:00
Ray Essick
a9da270159 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours am: ddaf6b4117 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: Id6f59abde3d02ddaa5b11bff07be7c36fbee0a7a
 2021-08-14 01:13:16 +00:00
Ray Essick
4789a09476 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours am: ddaf6b4117 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: I16848b895dca1e49b68bf3490612d43f98c71be5
 2021-08-14 01:12:43 +00:00
Ray Essick
ddaf6b4117 [automerger skipped] Rename android.media.MediaTranscodeManager -> MediaTranscodingManager am: 243e5ab2b2 -s ours 
am skip reason: Merged-In I40ab066cd61be8d278f21cc788016f2edd6bb86e with SHA-1 1168d9d014 is already in history

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

Change-Id: I137dc117cc9d7fd131c3ca2e221a8fbbc56c439d
 2021-08-14 01:11:25 +00:00
Treehugger Robot
461ea8ce30 Merge "Allow SHELL_UID to disable Bluetooth for testing" am: 4c462beeae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796128

Change-Id: Ic2b5ce12110773fde15da68cc93457b7544a9e48
 2021-08-14 01:09:59 +00:00
Treehugger Robot
4c462beeae Merge "Allow SHELL_UID to disable Bluetooth for testing" 2021-08-14 00:42:29 +00:00
Bill Yi
00430a3f3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 680e13f294 -s ours am: 2139ac2389 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a26b90c0a9c90db941fbc6ae3c807ca094b6b20
 2021-08-14 00:20:10 +00:00
Bill Yi
25c03b6b3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dde7 -s ours am: 85dca6379a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I776c3a4a76d45c620e34707ff3c48893ce4568d0
 2021-08-14 00:19:38 +00:00
Bill Yi
2139ac2389 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 680e13f294 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21d12d340d4b46feddf517a5d14e194368494943
 2021-08-14 00:01:17 +00:00
Bill Yi
5d6224c983 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 680e13f294 -s ours am: b242a8a935 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idde87ca13f4e33545872c3ee181bcc55cb8bb48e
 2021-08-14 00:01:15 +00:00
Bill Yi
30cd97bf42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dde7 -s ours am: eea50a1b6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id199d48e9352d936ba51b17549e483c8a07a862f
 2021-08-14 00:01:12 +00:00
Bill Yi
85dca6379a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dde7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69d1a14f5c03e4cb72ea5a1c2712be43dbf7bd56
 2021-08-14 00:00:53 +00:00
Bill Yi
945830385e Merge changes from topic "presubmit-am-4f2f6883d74b4b26ac21b30841644c64" into sc-dev-plus-aosp am: 41c6386507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543601

Change-Id: Ie8a57ed47ebc92242b641ca3ab0a7d191bab75a6
 2021-08-14 00:00:50 +00:00
Bill Yi
355d63b430 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ef466173ff am: daa3495add -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacbf709873700fc1cce697d11a22bce5178b924c
 2021-08-14 00:00:48 +00:00
Bill Yi
b242a8a935 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 680e13f294 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83639f094670f59a7b30c8e1a504bcd64a8f0d77
 2021-08-14 00:00:06 +00:00
Bill Yi
658ef0204e Merge changes from topic "presubmit-am-05c1ffc57ea7472e8f99038bc0424cc2" into sc-dev-plus-aosp am: def69fa19c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542674

Change-Id: I202b6ea8e6bf826a4711e35b9c967d7d54eba19a
 2021-08-13 23:59:53 +00:00
Bill Yi
b13723e563 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5338485ad1 am: bc26126724 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8acf91e5a0b8ca882ada0be64a317c8be5df6510
 2021-08-13 23:59:51 +00:00
Bill Yi
eea50a1b6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dde7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34c7794cc89d5c072b1dffe0ea800c2787a53bed
 2021-08-13 23:59:40 +00:00