Commit Graph

813479 Commits

Author SHA1 Message Date
TreeHugger Robot
33a8ba28df Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
4623f9738e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
bd843e84e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
66c0272ad2 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
b04b6758e3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
4c4eb6ae92 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
905e80afef Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
fbb9ddc363 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
aa3c19a8f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
2a4ef8ee32 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
3f3b3b1a4b Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
e05b73ff66 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
dde8e138c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
TreeHugger Robot
c72d2dd83e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-28 02:07:34 +00:00
Jack Yu
f3db9c87d3 Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 20f007c38c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2457667

Change-Id: I5d7bbc92107cad09e1d109e1a85f5c8828dd18f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:49:55 +00:00
Jack Yu
e64ef5a13e Added empty subscription manager service am: 36f55c44f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2457658

Change-Id: Ib4ad23586a5740712d834537ca7eedb0c2430487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:49:30 +00:00
Jack Yu
20f007c38c Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service"
* changes:
  Added builder for SubscriptionInfo
  Added empty subscription manager service
2023-02-27 19:46:34 +00:00
Dmitri Plotnikov
80928ce400 Merge "battery LED: low battery behavior" am: 9ca50dba46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2262421

Change-Id: Ifcc96ec91b9ea6941c450139c2b2d8689345f56a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 17:59:22 +00:00
Dmitri Plotnikov
9ca50dba46 Merge "battery LED: low battery behavior" 2023-02-27 17:25:30 +00:00
Christian Göllner
5964f39956 Merge "Add missing OWNERS for SettingsLib/DeviceStateRotationLock" am: aa8d01307d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455492

Change-Id: If3997e2a5028cc7dce3d28380dcccb40c3fb3c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 15:06:55 +00:00
Christian Göllner
aa8d01307d Merge "Add missing OWNERS for SettingsLib/DeviceStateRotationLock" 2023-02-27 13:39:53 +00:00
Christian Göllner
a7983df3e9 Add missing OWNERS for SettingsLib/DeviceStateRotationLock
It seems that files have been moved around, and that the
existing OWNERS file has not.

Change-Id: I391c79d7b65317a71dd358c2f1784c5afbaff21b
2023-02-27 11:57:37 +00:00
Jack Yu
6a0a3326fa Added builder for SubscriptionInfo
Added the builder for SubscriptionInfo, and make all members
final. This can prevent other clients accidentally modifying
the same copy of SubscriptionInfo.

Also moved getAllAccessRules into getAccessRules.

Bug: 239607619
Bug: 247140269
Test: Manual + atest SubscriptionInfoTest
Merged-In: If2973d78579cc0d0d3c6720d22a4b49a04a2b813
Change-Id: If2973d78579cc0d0d3c6720d22a4b49a04a2b813
2023-02-26 23:53:13 -08:00
Jack Yu
36f55c44f1 Added empty subscription manager service
Non-functional skeleton. The methods are added because we can't
remove methods in ISub.aidl at this point. Those are still used
by the to-be-removed SubscriptionController.

Bug: 239607619
Test: Manual
Merged-In: I66716314a2e5679e5a4fb7a9e429ae547bd0951d
Change-Id: I66716314a2e5679e5a4fb7a9e429ae547bd0951d
2023-02-26 22:38:11 -08:00
Bill Yi
f1c1554ca4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8475dabb875e74db6508100973fae831f43cf5c3
2023-02-26 21:06:59 -08:00
Bill Yi
9571f1e24c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I49f34448db7686d35e812a14ea359be0a0485b60
2023-02-26 21:06:09 -08:00
Bill Yi
981bfffff6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iea1985f4f37b40df02a52ee9df069888bdf9c059
2023-02-26 21:05:13 -08:00
Bill Yi
1394d0c9ff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2c6f47714bcf646ba0440aa8a132db146a34a23f
2023-02-26 21:04:12 -08:00
Bill Yi
36ac9bd81b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0a243fa2446a6eeec63a1990ef434b545f693cfc
2023-02-26 20:55:04 -08:00
Bill Yi
aa6473fc12 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4c3944bdeddf8c02815c4d428173db903e8edd27
2023-02-26 20:54:01 -08:00
Bill Yi
71a238bc4a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I84fa77eb326aba0faf301f97375d66cbf3c3cdfe
2023-02-26 20:53:08 -08:00
Bill Yi
0ae6800b8a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I86cc75162ce829b0fed394aa6b90c2d09e54bf2e
2023-02-26 20:52:13 -08:00
Bill Yi
6c7a73589a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaad312bd87630bea7bf6e88682d1284708d6ca99
2023-02-26 20:51:10 -08:00
Bill Yi
5c999273e9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1fe9907ff2d004518f500d3d3d7345d37c505188
2023-02-26 20:49:22 -08:00
Bill Yi
489b15faa3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaf42d65de9548a789b5758eacbdd90eebf37a403
2023-02-26 20:32:35 -08:00
Bill Yi
1ef08de994 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I820e96dac214fec2ba9ae67772b0a133472a5dae
2023-02-26 20:30:40 -08:00
Bill Yi
9cea8ee2a7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ec52b59747f020c3c9f3005096201eaeae7e10d
2023-02-26 20:28:45 -08:00
Bill Yi
062f6087c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia379ff6777aa47586a9745bfc38e5f3ed83a3d76
2023-02-26 20:27:48 -08:00
Treehugger Robot
973e5e59fe [automerger skipped] Merge "Add new column enabled_mobile_data_policies to siminfo table" am: a8e97b09f1 -s ours
am skip reason: Merged-In I460c24909fb1eae689d02cedc76e24e87674a891 with SHA-1 3238bb600c is already in history

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

Change-Id: I6dfdec5149cc5227ca6c07c3af56991a91bbe597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 04:14:43 +00:00
Ling Ma
3e7f547763 [automerger skipped] Add new column enabled_mobile_data_policies to siminfo table am: eee0912953 -s ours
am skip reason: Merged-In I460c24909fb1eae689d02cedc76e24e87674a891 with SHA-1 3238bb600c is already in history

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

Change-Id: I247d2c609bcd32c45b2ef422e82ae1be61317efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 04:14:14 +00:00
Treehugger Robot
a8e97b09f1 Merge "Add new column enabled_mobile_data_policies to siminfo table" 2023-02-27 02:53:25 +00:00
Ling Ma
3238bb600c Add new column enabled_mobile_data_policies to siminfo table
Add new column enabled_mobile_data_policies and copy the legacy data_enabled_override_rules to the new column. Future
read/write will only apply to the new column, and the legacy column will not be synced.

Bug: 244064524
Test: atest TelephonyManagerTest + TelephonyDatabaseHelperTest + TelephonyProviderTest + manual upgrade and observe user setting is preserved
Merged-In: I460c24909fb1eae689d02cedc76e24e87674a891
Change-Id: I460c24909fb1eae689d02cedc76e24e87674a891
(cherry picked from commit ed98c84815)
2023-02-26 21:22:15 +00:00
Ling Ma
eee0912953 Add new column enabled_mobile_data_policies to siminfo table
Add new column enabled_mobile_data_policies and copy the legacy data_enabled_override_rules to the new column. Future
read/write will only apply to the new column, and the legacy column will not be synced.

Bug: 244064524
Test: atest TelephonyManagerTest + TelephonyDatabaseHelperTest + TelephonyProviderTest + manual upgrade and observe user setting is preserved
Merged-In: I460c24909fb1eae689d02cedc76e24e87674a891
Change-Id: I460c24909fb1eae689d02cedc76e24e87674a891
2023-02-26 07:46:39 +00:00
Treehugger Robot
d83dd22dd0 Merge "Add to display OWNERS" am: f05f9b9608
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2446434

Change-Id: Ib4d65e68c58e10e171c62e28e8c392e7c1f55b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 17:00:18 +00:00
Lucas Lin
a86d00fab9 Merge "Clear the information of the underlying network" am: c232ead59f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455969

Change-Id: I947a1c672f50a5a22158f4735e96bb9d98870900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 16:57:53 +00:00
Treehugger Robot
f05f9b9608 Merge "Add to display OWNERS" 2023-02-24 16:39:44 +00:00
Lucas Lin
c232ead59f Merge "Clear the information of the underlying network" 2023-02-24 14:10:22 +00:00
Treehugger Robot
d71d9086d1 Merge "Update API text file format to include missing generic signature" am: 5ec41c255e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453865

Change-Id: I8c40ac17e7a6f092bb7355975ae71a5cae7469ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 14:00:58 +00:00
Treehugger Robot
5ec41c255e Merge "Update API text file format to include missing generic signature" 2023-02-24 13:58:24 +00:00
Alexei Nicoara
487cebaeb4 Merge "Updating rollback OWNERS file" am: feb7fd809a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453108

Change-Id: Ied41e0dc50b6b6d90dc101d7d3e76af2672bcec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 11:18:43 +00:00