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

654045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hongguang Chen
d355459a3c Merge "Fix Quiescent Reboot Reason" am: 850866e94a am: 933dacacf8 am: dc2d21b93d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962

Change-Id: I418d770eb17a316e6267d1b22a5b951f58b8f0e5
 2021-08-16 19:11:18 +00:00
Hongguang Chen
dc2d21b93d Merge "Fix Quiescent Reboot Reason" am: 850866e94a am: 933dacacf8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962

Change-Id: Ieb6970f1ca8303baa8f27744ec24c62dda98867b
 2021-08-16 18:41:34 +00:00
Hongguang Chen
933dacacf8 Merge "Fix Quiescent Reboot Reason" am: 850866e94a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962

Change-Id: If0cd58c17c3049597147389257f4dcfe895b1f54
 2021-08-16 18:29:03 +00:00
Hongguang Chen
850866e94a Merge "Fix Quiescent Reboot Reason" 2021-08-16 18:12:18 +00:00
Jeff Sharkey
5caec096e4 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: 3d3db4b676 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456

Change-Id: I364909895eb27d0a24ba0eb6a8f40ec4e65b8a5d
 2021-08-16 16:19:32 +00:00
Jeff Sharkey
dd4b948409 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: e99475ac37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456

Change-Id: Ib3032e8f1dd3ecdd00b518b95fdb25184840fb13
 2021-08-16 16:19:08 +00:00
Jeff Sharkey
3d3db4b676 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456

Change-Id: I412bc049b951516c9abd2c8d821ca71db810e2e9
 2021-08-16 16:06:29 +00:00
Jeff Sharkey
e99475ac37 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456

Change-Id: Iff34ad44acacd02e949c806c75f449b461c74e77
 2021-08-16 16:05:45 +00:00
Jeff Sharkey
5af6057607 Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev 2021-08-16 15:55:08 +00:00
Ryan Mitchell
f34a97716a Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 am: 9fd3a5cc5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: I9e54ecffb45f0248d6aa83ed51d435419985588e
 2021-08-16 15:42:00 +00:00
Ryan Mitchell
ed2824c92d Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 am: 73feaa09a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: I594d0ece99a0dce1ce59602f35aa824c5c02b2f1
 2021-08-16 15:41:46 +00:00
Ryan Mitchell
9fd3a5cc5e Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: I3709c3153186b42cdc9923605b2d895183625a97
 2021-08-16 15:23:03 +00:00
Ryan Mitchell
73feaa09a6 Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977

Change-Id: I982da8dc1e245e339d3f03c7c084f88f8ad1b61d
 2021-08-16 15:22:03 +00:00
Ryan Mitchell
1561c6ac27 Merge "Guard against null info when applying widget RROs" into sc-dev 2021-08-16 15:08:06 +00:00
Selim Cinek
b60af8ab40 Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc am: 193406410a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318

Change-Id: I0af541729aded40dc860d977dd39d6ffdec42a56
 2021-08-16 12:01:38 +00:00
Selim Cinek
46c86140d0 Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc am: 557189cf28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318

Change-Id: Ic37b7620ab3e3883d0ba150c8e2c40780fc592a7
 2021-08-16 12:01:17 +00:00
Selim Cinek
193406410a Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318

Change-Id: I772cb9e60857aebda21a11083ed2bc2690a1517c
 2021-08-16 11:52:16 +00:00
Selim Cinek
557189cf28 Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318

Change-Id: I5f992e78160d4ba8e71264033efdb474d22e2f87
 2021-08-16 11:51:22 +00:00
Selim Cinek
ab89e910bc Merge "Don't create one-handed-background-panel after rotation" into sc-dev 2021-08-16 11:40:26 +00:00
James Wei
c84e69def9 USB: Correct title bar notification am: c0162a74b9 am: 4f7f6fba23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595

Change-Id: I0ac86bf772977f32c643365802d13d8134175ba5
 2021-08-16 11:01:42 +00:00
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
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