Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
767,883 Commits 3 Branches 0 Tags
4ec14cc958a9ce18d441873344fda7071db26468
Commit Graph

767883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Lin
4ec14cc958 [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours am: 2770c3c39b -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: Ie641f3e3130fb1cc36f0c18aaac33ce660109d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:56:49 +00:00
TreeHugger Robot
c3756b1c1c Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am: f596386556 am: 72645f44b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18490669

Change-Id: I1d2c90580dd3e8c800f302094820b22076a79854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:56:20 +00:00
Lucas Lin
2770c3c39b [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: I9cc33407c2fff5daff528bf6fdd1a936aa5b6ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:52:50 +00:00
TreeHugger Robot
2f6fcba92a Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 am: a5a242d614 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: I0d8811fbf2e7d5d18968e1dc39ae1f7bd5d3da5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:51:35 +00:00
Rambo Wang
2644c35538 [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a am: e539d7f831 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: I616a29b7f20adbcd624ab18b0af7cbd0b4a22eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:51:26 +00:00
TreeHugger Robot
85e544e626 Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d am: c944dd27b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: Id3d8744d977526d99b708594671cd839fdc5fddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:50:51 +00:00
Calvin Pan
bf9ff671b7 Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 am: db208be062 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: I2b96e4e44574c01926f29b9f8d49625864cf6e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:50:17 +00:00
TreeHugger Robot
72645f44b2 Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am: f596386556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18490669

Change-Id: I99b99dbf097d3fb228818d0da09e375f66730672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:49:34 +00:00
Arc Wang
845b49fe96 Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 am: c2997016c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: I93e3ae3b54d7383d008954208d7273c44319aad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:49:10 +00:00
TreeHugger Robot
6327763760 Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f am: d774ce125f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: Iea79d575852af828b8c3a272cb1b5f03d24831d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:47:48 +00:00
Lucas Lin
57836676ac [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: I08f169e98cde7f32b63143b2ee370b290c2775bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:44:02 +00:00
TreeHugger Robot
f596386556 Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev 2022-05-20 12:33:58 +00:00
Ricky Wai
638a70b7b3 Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda17e am: a70da224db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694

Change-Id: I868f3664b0baf92a2158a33c8631554958773c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:29:39 +00:00
Wesley Wang
ac4834c66e Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8ee1 am: 308a7d8451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482950

Change-Id: Iba3e242dc784d0699ed3ac1de995f2ac71baa3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:29:29 +00:00
Chaohui Wang
6b8d237d6c Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e2f am: 623ab35698 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195532

Change-Id: I93e10f7c8f421738db23bf45eef793a6c9c12769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:29:07 +00:00
Ricky Wai
a70da224db Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda17e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694

Change-Id: If96615fcb282df2f34399c3ef9f3246b3e506f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:27:03 +00:00
Alex Johnston
2b388d9586 Merge "Update network logging delegation docs" into tm-dev am: f428adf2e4 am: 2e71fc0ac5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475051

Change-Id: Ic0db0dd2f7c4a2f95e2f189004b688aa523087d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:26:53 +00:00
Wesley Wang
308a7d8451 Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8ee1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482950

Change-Id: I84303198dc0d3bddb8b86458d59ef465ae6337ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:26:44 +00:00
Chaohui Wang
623ab35698 Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195532

Change-Id: I924745cc073c73bd29d5cd7bd5e354ccfa89014c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:26:19 +00:00
Michael Rosenfeld
97ca52ca3c Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am: 512b28faf4 am: 9c53571bee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950624

Change-Id: I734fe88b20f2b7b3e04d3d53a4050f8c3b0e6fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:26:16 +00:00
Alex Johnston
2e71fc0ac5 Merge "Update network logging delegation docs" into tm-dev am: f428adf2e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475051

Change-Id: If03a62dc85831f97083ee8333cc48cdc80fe4174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:25:38 +00:00
TreeHugger Robot
947d31c533 Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 am: 076a9e612a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: Ie0f8e57ba086eaa650571e40eae6bb56152ee723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:25:35 +00:00
Rambo Wang
a23b16281b [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a am: 597690dc7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: I37777f520f99d2b9f285edaf5011c07470614943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:25:28 +00:00
TreeHugger Robot
a5a242d614 Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: Ie7ef7f0b78527d1b9da503e5a18da7925f9914af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:25:17 +00:00
Rambo Wang
e539d7f831 [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: I9ac77282391e0175ffe2e30d013b5877c98a2304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:25:12 +00:00
Michael Rosenfeld
9c53571bee Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am: 512b28faf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950624

Change-Id: I35b0ffd2746a80d167c82e7e061b646a3a82d74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:24:58 +00:00
TreeHugger Robot
f7ff200a1c Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d am: c0477b594d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: I9b98c3db4d91a9b6e7167d5f4f979424f6f69216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:24:49 +00:00
TreeHugger Robot
076a9e612a Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: I8d015f409dfa06b1a63f109a3566acafc7435d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:24:27 +00:00
Rambo Wang
597690dc7f [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226

Change-Id: I658fe767e8d97dd12c761182937c45b4fd7169b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:24:22 +00:00
Calvin Pan
cdcc0c0fa4 Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 am: 3b35df974a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: Ic681b525f55ba1ab595d88f2fc569dc08dfa6c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:24:09 +00:00
TreeHugger Robot
c944dd27b0 Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: Id7ac61f8f529fe2b779da9712dc4e5c4d762142b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:24:03 +00:00
TreeHugger Robot
c0477b594d Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: Idb14d285578705e5c6dbf228df23438a44e669dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:23:54 +00:00
Arc Wang
9fc3ff453a Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 am: c58e951066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: I5dae58801800b9d6ffb1a76098792ed0930a7c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:23:21 +00:00
Calvin Pan
3b35df974a Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: Ia7718f03133f127e1f62c23afe3a3d4a66188a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:22:27 +00:00
TreeHugger Robot
d8f6763ccb Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f am: 1c458d3522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: I77c0cfd7ae5ffb211c83395fb0f6c488a0b2eb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:22:23 +00:00
Arc Wang
c58e951066 Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: Ic2f6e6a4914a06e70b468a7a50741568820eefae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:22:01 +00:00
Issei Suzuki
90bd32910b Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev am: a198a65234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436742

Change-Id: I62199369897dd1fad6340721cc3b5bb6318b7e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:21:28 +00:00
Calvin Pan
db208be062 Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: I480b120e29adc03fbff5d8ff7c5f39e116677364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:19:26 +00:00
Michael Groover
20adc38129 Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: 8aa6d20125""" into tm-d1-dev am: c2da54f24e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18409337

Change-Id: I6ada76abe7ef1f93105f79a861792228f5a0163d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:19:05 +00:00
TreeHugger Robot
1c458d3522 Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: I0689832d136f55fa9a127754d8c6645d02332e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:19:02 +00:00
Arc Wang
c2997016c9 Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: If6c52555c1999e1287f2cb1cdfd6939aa8e1e2e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:18:38 +00:00
TreeHugger Robot
d774ce125f Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: I74279a09da6193f235190de76316724d4684629b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 12:18:08 +00:00
Ricky Wai
8d4ecda17e Merge "Do not update enabled state when app ops is not changed" into tm-dev 2022-05-20 10:52:36 +00:00
Wesley Wang
4788cc8ee1 Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev 2022-05-20 09:50:10 +00:00
Chaohui Wang
dfed7f9e2f Merge changes from topic "jank-toggle" into tm-dev 
* changes:
  Add SettingsJankMonitor
  Add SETTINGS_TOGGLE CUJ to InteractionJankMonitor
 2022-05-20 09:22:46 +00:00
Alex Johnston
f428adf2e4 Merge "Update network logging delegation docs" into tm-dev 2022-05-20 08:29:47 +00:00
Issei Suzuki
a198a65234 Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev 2022-05-20 07:29:31 +00:00
Weng Su
54824c3e64 Show mobile data icon with carrier Wi-Fi level in Quick-Settings 
- If carrier Wi-Fi is active then use carrier Wi-Fi level instead of
  mobile data level.

- If carrier Wi-Fi level is less than min-level, use min-level instead.

Bug: 222885558
Test: manual test
atest -c InternetDialogControllerTest

Change-Id: If8d2871e61396dd8eb3ebab5eda0906d46a06c33
 2022-05-20 15:01:06 +08:00
Michael Rosenfeld
512b28faf4 Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev 2022-05-20 06:54:58 +00:00
TreeHugger Robot
715e111819 Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev 2022-05-20 06:43:23 +00:00