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

7157 Commits

Author SHA1 Message Date
Treehugger Robot
35f0b0f611 Merge "modify the comment for SYNC_DISABLED_MODE_NONE" am: a4106af231 am: 808aff6755 am: 5ff65420df am: 0b8273f260 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132183

Change-Id: I934c39d7d4f305acf59941ef93626e2b49397077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:35:01 +00:00
Treehugger Robot
5ff65420df Merge "modify the comment for SYNC_DISABLED_MODE_NONE" am: a4106af231 am: 808aff6755 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132183

Change-Id: Ie5c78d5afc9858cc0fee380b8cea9e42e6a652dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 16:57:59 +00:00
zhangjincheng
15accb6437 modify the comment for SYNC_DISABLED_MODE_NONE 
what is the mean of SYNC_DISABLED_MODE_NONE?

form code, it may should be "sync is not disable"

Signed-off-by: zhangjincheng <zhangjincheng@xiaomi.com>
Change-Id: I0017001966a9bee524e92803a1bc48a436f68129
 2022-06-22 15:01:22 +08:00
Chen Xu
54aadd229e Merge "Adding maxTargetSdk AndroidS_V2 to DATA_ROAMING. This will make sure that beyond S people can not access the DATA_ROAMING API from Settingss.Ideal way to use this is from TelephonyManager." into tm-dev am: 567d57f206 am: 9570621986 am: a0da35749a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692749

Change-Id: I153c6ac9afb69fd13932e0e48bb3dedb27b2d691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 18:51:15 +00:00
Chen Xu
a0da35749a Merge "Adding maxTargetSdk AndroidS_V2 to DATA_ROAMING. This will make sure that beyond S people can not access the DATA_ROAMING API from Settingss.Ideal way to use this is from TelephonyManager." into tm-dev am: 567d57f206 am: 9570621986 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692749

Change-Id: I525c8730501ef9569a3bad091787d10ef0eed5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 18:44:14 +00:00
Chen Xu
3134842ec5 Merge "Adding maxTargetSdk AndroidS_V2 to DATA_ROAMING. This will make sure that beyond S people can not access the DATA_ROAMING API from Settingss.Ideal way to use this is from TelephonyManager." into tm-dev am: 567d57f206 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692749

Change-Id: I549bb3e7a0b6c5f8390ceb32ca87e1bfce5468f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 18:18:24 +00:00
Zaiyue Xue
aa1b2c12f5 Merge "Define setting name ADAPTIVE_CHARGING_ENABLED." into tm-qpr-dev am: 3ba66c27da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18610073

Change-Id: I0b823d986918c6a9055acbde9573613dad3883fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:44:30 +00:00
Shivakumar Neginal
8335fd51fb Adding maxTargetSdk AndroidS_V2 to DATA_ROAMING. This will make sure that 
beyond S people can not access the DATA_ROAMING API from Settingss.Ideal
way to use this is from TelephonyManager.

Test: manual.
Bug: 172467621
Change-Id: I5bbdd886599ff0ecf66eb72beb78456adc4d632c
 2022-06-01 06:51:43 +00:00
xuezaiyue
3ec8de2273 Define setting name ADAPTIVE_CHARGING_ENABLED. 
Test: manual
Bug: 230386304
Change-Id: I65508f99b7754e152009c2d6f4cb868ccb46d4de
 2022-05-27 14:31:08 +08:00
Kholoud Mohamed
38c1a79163 Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a am: 1368e8a55d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344246

Change-Id: I1dd8a8c3fdc9fccb3d24fca7746cd249ff50097c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:36:05 +00:00
Kholoud Mohamed
5e9be671a0 Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a am: 1368e8a55d am: bf80045f98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344246

Change-Id: I9abba6f436aefd947e1bbd8eee6c5ba5e2f25410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 10:55:13 +00:00
Kholoud Mohamed
bf80045f98 Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a am: 1368e8a55d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344246

Change-Id: Id17e351eb4a60d76fdc7d77be6873df15a13e547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 10:49:52 +00:00
Kholoud Mohamed
c783dba686 Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344246

Change-Id: I3da3c36af1db0200341b8aed9becc9294ce57e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 10:22:31 +00:00
kholoud mohamed
b03a00840f Add device policy manager namespace to public namespaces 
Bug: 225178429
Test: manual
Change-Id: I5091ac4e4198b76bad5bc91341e3d32f60176090
 2022-05-12 15:19:00 +01:00
Julia Reynolds
faecedc2a7 Merge "Remove notification permission feature flag" into tm-dev am: af7982277b am: 1c7aab6735 am: 72b1df5626 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164160

Change-Id: I528a4704e1543f074c8570d911dfe53760466630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:28:40 +00:00
Julia Reynolds
e62f470c60 Merge "Remove notification permission feature flag" into tm-dev am: af7982277b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164160

Change-Id: I44d1936b8ff8756943b9b94a688a2e892f9dc994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:48:00 +00:00
Julia Reynolds
729eee42e5 Merge "Remove notification permission feature flag" into tm-dev am: af7982277b am: 1c7aab6735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164160

Change-Id: Ie439e1d17ace323879e1c7fa2ceeb0be866954ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:21:09 +00:00
Julia Reynolds
72b1df5626 Merge "Remove notification permission feature flag" into tm-dev am: af7982277b am: 1c7aab6735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164160

Change-Id: Id2c0a69d8593e302558d803d6e7ba9376bce17fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:14:25 +00:00
Julia Reynolds
af7982277b Merge "Remove notification permission feature flag" into tm-dev 2022-05-09 20:16:09 +00:00
kholoud mohamed
affc124b1c RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d am: ab46aebde1 am: 4eeea834d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: I07b54979e81fcbdea875b5a71f20f7103af9a7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:53:40 +00:00
kholoud mohamed
ab46aebde1 RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: I28d03b39275eaf932617164b168466a68d3189d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:37:05 +00:00
kholoud mohamed
96a994a924 RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d am: 3dea601114 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: I2d65c9019d90e76f31f775cbbb31311c6d67b608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:17:53 +00:00
kholoud mohamed
f90b1ac98d RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments 
Bug: 225178429
Test: N/A
Change-Id: Ic4a57962a69a31daf498bf87888bae23246f60b6
 2022-05-08 09:43:03 +00:00
Beverly Tai
01b240156b Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d73142 am: 60903c5876 am: 8fb9cff35d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18173162

Change-Id: Ic381006e7e90f13338cfcecab21e8cc98c5747f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 02:51:11 +00:00
Beverly Tai
8fb9cff35d Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d73142 am: 60903c5876 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18173162

Change-Id: Ibdbcb2ade800c49481d67251a582051954e57480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 02:26:37 +00:00
Beverly Tai
d48af70290 Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d73142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18173162

Change-Id: Ic23e2a310336dcc5da8bbada8a94c1978350644e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 01:57:49 +00:00
Beverly Tai
0dd4d73142 Merge "Add additional toggleable active unlock settings" into tm-dev 2022-05-07 01:28:17 +00:00
Beverly
ba0f3d6da2 Add additional toggleable active unlock settings 
Test: manual
Test: atest ActiveUnlockConfigTest
Fixes: 231391317
Fixes: 231390692
Fixes: 231390433
Change-Id: Icaf4c1e568e84ecf4d571537f30f7f9b0efb3e0c
 2022-05-06 18:04:56 +00:00
Grace Jia
04a1025fb2 Merge "Add USER_MISSED_NEVER_RANG to cover the case for call reported as miss even before it get the chance to ring." into tm-dev am: 28232fc90e am: 6d7bcb464e am: 5a2e25ab72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17968712

Change-Id: I4479ba83238e00942007ef812c1c9614b6649711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:52:06 +00:00
Grace Jia
1e849171da Merge "Add USER_MISSED_NEVER_RANG to cover the case for call reported as miss even before it get the chance to ring." into tm-dev am: 28232fc90e am: 2888ffd052 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17968712

Change-Id: Iba4029219e356174a071a4f8007e21533ac517b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 15:45:00 +00:00
Grace Jia
6d7bcb464e Merge "Add USER_MISSED_NEVER_RANG to cover the case for call reported as miss even before it get the chance to ring." into tm-dev am: 28232fc90e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17968712

Change-Id: I3338da27fc07b67a7905a6f0f0cbb485c36a38ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:21:22 +00:00
TreeHugger Robot
332b0feb76 Merge "Simplify dock setup state setting" into tm-qpr-dev am: baf76a1173 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164726

Change-Id: I7867874177d4dfff8c1133c22b1f8562ed913450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:21:20 +00:00
TreeHugger Robot
baf76a1173 Merge "Simplify dock setup state setting" into tm-qpr-dev 2022-05-05 17:46:04 +00:00
Grace Jia
28232fc90e Merge "Add USER_MISSED_NEVER_RANG to cover the case for call reported as miss even before it get the chance to ring." into tm-dev 2022-05-05 17:43:34 +00:00
Julia Reynolds
0be19ec3c5 Remove notification permission feature flag 
And the related obsolete code.

Test: SystemUITests, framework services tests, NotificationManagerTest
Fixes: 231344755
Change-Id: Id14941f82305b0216f2a12221d4195f8afcc65ab
 2022-05-04 17:59:02 -04:00
Kate Montgomery
bc190889a6 Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c am: e0d552c3e5 am: 493c2466aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765

Change-Id: I49bc3560035598cf9b7bdf883cb1a56d73d6db92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:29:20 +00:00
Kate Montgomery
493c2466aa Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c am: e0d552c3e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765

Change-Id: I2c1ff8c40cc463105c686643fea173e4de98015f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:51:47 +00:00
Kate Montgomery
2f80586e30 Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c am: e0d552c3e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765

Change-Id: Iee6939a35e668314abed788d009fd78af08e64c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:51:12 +00:00
Lucas Silva
384bac3fc7 Simplify dock setup state setting 
The resumed state is no longer necessary, as this has been merged with
the started state.

Bug: 227649823
Test: locally on device
Change-Id: If6229dac0f121011f872fda5f06380c9fd909c4a
 2022-05-04 11:48:23 -04:00
Kate Montgomery
d341afed57 Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765

Change-Id: Ia631ef9a613351eef094342fe1efe309a92e5a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:17:31 +00:00
Kate Montgomery
7c4b55cc6c Merge "Revert "Update show system experiment behavior."" into tm-dev 2022-05-04 14:52:56 +00:00
Grace Jia
747c85d54e Add USER_MISSED_NEVER_RANG to cover the case for call reported as miss 
even before it get the chance to ring.

Bug: 230009891
Test: TelecomUnitTest
Change-Id: I9e6d69b7ee763ebc6a7a1693cb0bb54f5bde7b1b
 2022-05-03 21:25:59 +00:00
Lucas Silva
4887e04a17 Merge "Add new setting to store the dock setup state." into tm-qpr-dev am: 7b31accbcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18054156

Change-Id: I48c9c5d477737988fe5d22108747ddfb68f49172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 17:40:08 +00:00
Vadim Caen
7a8d34aadc Add developer option for back animation DO NOT MERGE am: 94f506aa2a am: d67d675344 am: 33ebed72f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I94cbd48c247b8b671e13123546b040e5b2593050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 15:09:06 +00:00
Vadim Caen
d6518e5a53 Add developer option for back animation DO NOT MERGE am: 94f506aa2a am: d67d675344 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I6e59464cb0974b9dbce2b9de49aefa4e1fa7c135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:43:48 +00:00
Vadim Caen
33ebed72f6 Add developer option for back animation DO NOT MERGE am: 94f506aa2a am: d67d675344 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I5f9e2d222471f3fdf9df4ac471c4db56c484ea19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:42:01 +00:00
Vadim Caen
d67d675344 Add developer option for back animation DO NOT MERGE am: 94f506aa2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I18501722cd0083971ee9d6134900f7f0e36f299f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:17:39 +00:00
Vadim Caen
3151a65ec8 Add developer option for back animation DO NOT MERGE am: 94f506aa2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I752f23cdeb04c7f514c3de6255eca5e5f681e589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:17:25 +00:00
Vadim Caen
064b49a1a1 Merge "Add developer option for back animation DO NOT MERGE" into tm-dev 2022-05-03 14:13:57 +00:00
TreeHugger Robot
a3030c3f19 Merge "Add ActiveUnlock Settings" into tm-dev am: e6c8903e65 am: 775f991976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030064

Change-Id: I0e7f95e5b69e5900c7639da0904e8639eec6a60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:38:01 +00:00