Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
656,109 Commits 3 Branches 0 Tags
72e503e39566251bc78729585f4eb02a9ecb1c3e
Commit Graph

656109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Xu
72e503e395 Merge "Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3"" into sc-qpr1-dev am: 1ec12f22c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15805706

Change-Id: I2a15ce360aa667ef4a24f7b8657bc950578f489c
 2021-09-10 19:30:49 +00:00
Ying Xu
d20eac56c0 Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3" am: 493a11ea70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15805706

Change-Id: Ie1c11f490322529eb6a19212c5c5f8ba511364ce
 2021-09-10 19:30:43 +00:00
Ying Xu
cd99acd47d Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev am: fd48e9f7e5 am: 462291a559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: Ia95122cbf9c4baf32e12e45fdc51da2873d8befe
 2021-09-10 19:30:12 +00:00
yinxu
d6ce3e841c [automerger skipped] [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 am: b4fcb5842b -s ours 
am skip reason: skipped by user yinxu

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

Change-Id: Ic9b693d77d23f2b91a9359a255ee4bbaf6e5f634
 2021-09-10 19:29:56 +00:00
Benedict Wong
ce69365479 Merge "Always trigger safe mode callbacks" am: 831f78825b am: 24e038e8a4 am: a03a566bb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1811936

Change-Id: I15d5d68b7236b8e5221ea0b0db8415f217d7363d
 2021-09-10 19:29:47 +00:00
Benedict Wong
a03a566bb1 Merge "Always trigger safe mode callbacks" am: 831f78825b am: 24e038e8a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1811936

Change-Id: Iab1d2875aac2acc7a2e67045d1c2cd07aa4112ef
 2021-09-10 19:14:50 +00:00
Ying Xu
1ec12f22c2 Merge "Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3"" into sc-qpr1-dev 2021-09-10 19:12:01 +00:00
Ying Xu
42ef4fdf67 Merge "Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 am: 0e2e59714d"" into sc-qpr1-dev-plus-aosp 2021-09-10 19:11:34 +00:00
Ying Xu
705b0d8503 Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 am: 0e2e59714d" 
This reverts commit 6c57da52c2.

Reason for revert: Breaking the build

Change-Id: I028b5a3b630a8ab4d798a458f0215b477acdb7dc
 2021-09-10 19:07:26 +00:00
Ying Xu
493a11ea70 Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3" 
This reverts commit b4fcb5842b.

Reason for revert: Breaking the build

Change-Id: Iaee8310ad7d661e3ff4d7f66a1f7813b9b81414a
 2021-09-10 19:06:54 +00:00
Benedict Wong
24e038e8a4 Merge "Always trigger safe mode callbacks" am: 831f78825b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1811936

Change-Id: Ib8cf8010996f6eb52db438f5944af4b5ee66af7a
 2021-09-10 18:56:56 +00:00
Dmitri Plotnikov
58214c18dd Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: Iedc246526e371342096d6e3354b0e742bd4c855c
 2021-09-10 18:56:26 +00:00
Dmitri Plotnikov
e69a707085 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: I531bd2c8da470bbde94135dfdddc425de5dbbf9c
 2021-09-10 18:41:20 +00:00
Benedict Wong
831f78825b Merge "Always trigger safe mode callbacks" 2021-09-10 18:39:27 +00:00
Ying Xu
462291a559 Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev am: fd48e9f7e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: I3ea5d7aa20e109875f8ee0c278d25291f891d8b7
 2021-09-10 18:31:07 +00:00
Ying Xu
5f9bbae569 Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev am: fd48e9f7e5 am: c33250a2f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: I5b445bd69b80dab500f2a32c9edfcde598bf3220
 2021-09-10 18:30:26 +00:00
yinxu
b4fcb5842b [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: Ie572073a92f03d8951054e690ba4d4d077083534
 2021-09-10 18:25:09 +00:00
Dmitri Plotnikov
cc225325e3 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: If3cc87baf6a2249634e3f35ea8683177d9ace1c9
 2021-09-10 18:20:32 +00:00
yinxu
6c57da52c2 [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 am: 0e2e59714d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: I7f397e17521ddb1610383659072e1a4159840ac2
 2021-09-10 18:20:27 +00:00
Lucas Dupin
8bb5307a1e Merge "Correctly clip QS during heads-up pull down" into sc-qpr1-dev am: 33be4a7695 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15759151

Change-Id: I495bef9f10f1e1eecbf5bbad70ea34e0638b193c
 2021-09-10 18:07:08 +00:00
Jeff DeCew
87eaf17ba9 Merge "FooterView color logic cleanup" into sc-dev am: 4a8d463e14 am: 989d6d90d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15736948

Change-Id: I0d1f32a698355c83ca4e7f4c6026f09342cf0a27
 2021-09-10 18:06:51 +00:00
Dmitri Plotnikov
a84bdc93a8 Merge "Add OWNERS for BatteryStats related files" 2021-09-10 18:04:36 +00:00
Jeff DeCew
825388a83b Merge "FooterView color logic cleanup" into sc-dev am: 4a8d463e14 am: 5c5d74f203 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15736948

Change-Id: I8ff91ecc0e140269dab6363e95a24b535f7768da
 2021-09-10 17:56:57 +00:00
Lucas Dupin
33be4a7695 Merge "Correctly clip QS during heads-up pull down" into sc-qpr1-dev 2021-09-10 17:48:09 +00:00
Jeff DeCew
989d6d90d1 Merge "FooterView color logic cleanup" into sc-dev am: 4a8d463e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15736948

Change-Id: I24d69f48ad2c8f09507917f58dd3445fefc1e154
 2021-09-10 17:47:49 +00:00
Ying Xu
c33250a2f7 Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev am: fd48e9f7e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: Ifa015d24862692450fc439ccee732957c2dc0482
 2021-09-10 17:47:42 +00:00
yinxu
0e2e59714d [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15797335

Change-Id: I93de4a6e852e13e3e746645aaadca9c1ae5ff2e2
 2021-09-10 17:47:36 +00:00
Jeff DeCew
5c5d74f203 Merge "FooterView color logic cleanup" into sc-dev am: 4a8d463e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15736948

Change-Id: I8df7b8ef2234080a3bcc2f0ac08da178ce9af81c
 2021-09-10 17:47:07 +00:00
Ying Xu
fd48e9f7e5 Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev 2021-09-10 17:43:56 +00:00
Jeff DeCew
4a8d463e14 Merge "FooterView color logic cleanup" into sc-dev 2021-09-10 17:36:55 +00:00
yinxu
bc6f74dbc3 [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model 
Bug: 199176067
Test: Manual tests, unit tests
Change-Id: Ic1b286a31c429b781652dcb24a1351b85f81edeb
 2021-09-10 09:31:56 -07:00
Jeff DeCew
5ff3a6c538 Merge changes I0fc3b7ae,I712e6d6b into sc-qpr1-dev am: 2f0616bd79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15795789

Change-Id: I6260a6c0df1d2de5765d9ee9488ec10995cfd64a
 2021-09-10 15:58:22 +00:00
Jeff DeCew
2f0616bd79 Merge changes I0fc3b7ae,I712e6d6b into sc-qpr1-dev 
* changes:
  Reduce the color contrast requirements for the emphasized action button fill color.
  Refactor the color span code inside Notification.java and add tests.
 2021-09-10 15:28:37 +00:00
TreeHugger Robot
efc5d07b7a Merge "USB: Adjust exception message in dealing with permission check #2" into sc-qpr1-dev am: 8173263d78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15794990

Change-Id: I40338a27445f1d95ecc42621aadf2feda5398be6
 2021-09-10 06:07:23 +00:00
Aaron Huang
4210315294 [automerger skipped] Merge "NetworkStats: Avoid Division By 0" into sc-qpr1-dev am: c98d5a9d97 -s ours 
am skip reason: Merged-In I4e5ac9da7adf707d7f991483555ab5c6d0cc3245 with SHA-1 aeaa9cf589 is already in history

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

Change-Id: I32041742d029c9ce5d91e5006978e7debd9375d9
 2021-09-10 06:06:52 +00:00
TreeHugger Robot
8173263d78 Merge "USB: Adjust exception message in dealing with permission check #2" into sc-qpr1-dev 2021-09-10 06:03:13 +00:00
Aaron Huang
c98d5a9d97 Merge "NetworkStats: Avoid Division By 0" into sc-qpr1-dev 2021-09-10 05:48:55 +00:00
SongFerng Wang
77c9dba023 Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 am: 52fbd9907e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786476

Change-Id: I08065ca7f3565ee677d1162ceb2e99a28770efda
 2021-09-10 03:06:28 +00:00
SongFerng Wang
4e969c2bb3 Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 am: f6519efeff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786476

Change-Id: Ic4cc211a9c5fc770cb7ab99d87499a438f665d8c
 2021-09-10 02:58:52 +00:00
TreeHugger Robot
493a530ee6 Merge "Align Keyguard statusBar margin padding to phone's" into sc-qpr1-dev am: 2974556789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15674531

Change-Id: I2f369e1dd79a12228432bac2fdb051fb43f1295b
 2021-09-10 02:58:23 +00:00
SongFerng Wang
f6519efeff Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786476

Change-Id: Ie6f4fad470bf9dd4443a98fa3220651319613fb6
 2021-09-10 02:48:59 +00:00
SongFerng Wang
52fbd9907e Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786476

Change-Id: I0e37e419f00f6ba44df7867658d92277ede2f017
 2021-09-10 02:48:05 +00:00
TreeHugger Robot
2974556789 Merge "Align Keyguard statusBar margin padding to phone's" into sc-qpr1-dev 2021-09-10 02:43:20 +00:00
SongFerng Wang
f30a4cd112 Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev 2021-09-10 02:32:11 +00:00
Treehugger Robot
749746b154 [automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 99f31b981d -s ours am: 4c40734d1a -s ours am: 77374e5afe -s ours 
am skip reason: Merged-In Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c with SHA-1 cc89e936cf is already in history

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

Change-Id: Iccb7f1564aaa4df30e74ab619cd0e7db7b1e0359
 2021-09-10 01:52:01 +00:00
Dmitri Plotnikov
c757d48049 Merge "Add OWNERS for BatteryStats related JNI files" am: 542aace5fc am: a8231dae28 am: 97c1891c53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823180

Change-Id: I95d94ffce01830d24b51dd48ad3f04bbcaf12a04
 2021-09-10 01:51:38 +00:00
TreeHugger Robot
ec3f67ade6 Merge "Update owners file" into sc-qpr1-dev am: 51f1231c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15796037

Change-Id: I03c3f4fd0a706ee7542ba6a4cca1a7cecc3eeb17
 2021-09-10 01:41:32 +00:00
Treehugger Robot
77374e5afe [automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 99f31b981d -s ours am: 4c40734d1a -s ours 
am skip reason: Merged-In Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c with SHA-1 cc89e936cf is already in history

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

Change-Id: I0e977fcc0316b0a33fbb2b3d336600a606b04120
 2021-09-10 01:31:54 +00:00
Dmitri Plotnikov
97c1891c53 Merge "Add OWNERS for BatteryStats related JNI files" am: 542aace5fc am: a8231dae28 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823180

Change-Id: I47d7bbd2e86aa7fd0732ae3d2f56c9b0be733dd6
 2021-09-10 01:31:28 +00:00
TreeHugger Robot
51f1231c91 Merge "Update owners file" into sc-qpr1-dev 2021-09-10 01:27:25 +00:00