Bill Yi
b0804b2db6
[automerger skipped] Import translations. DO NOT MERGE am: 4abf9fd36e -s ours am: ecc7b533fe -s ours am: 141dec0b99 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If7fa82dd50d549e8700ffc077b6a73725df1306f
2020-05-09 07:09:18 +00:00
Bill Yi
c1bc125e10
[automerger skipped] Import translations. DO NOT MERGE am: 4abf9fd36e -s ours am: a3c389392e -s ours am: 181322b9bb -s ours
...
am skip reason: subject contains skip directive
Change-Id: I636a7b1fe6534c6e64b34f476c8efac6d297a02e
2020-05-09 07:09:00 +00:00
Bill Yi
141dec0b99
[automerger skipped] Import translations. DO NOT MERGE am: 4abf9fd36e -s ours am: ecc7b533fe -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6a29a08166db97568b2eada59f858859f72c1dfb
2020-05-09 06:57:34 +00:00
Bill Yi
181322b9bb
[automerger skipped] Import translations. DO NOT MERGE am: 4abf9fd36e -s ours am: a3c389392e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I53cc484252f39b6d49255677b8ca6f7356b40edc
2020-05-09 06:57:14 +00:00
Bill Yi
ecc7b533fe
[automerger skipped] Import translations. DO NOT MERGE am: 4abf9fd36e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1b7acfc04eeca335d60b8c7d8c9c579c601f2a91
2020-05-09 06:45:08 +00:00
Bill Yi
a3c389392e
[automerger skipped] Import translations. DO NOT MERGE am: 4abf9fd36e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib451084506c50e9aa142921a982dd4fa3c78b3ef
2020-05-09 06:44:49 +00:00
TreeHugger Robot
754ba9c701
Merge "Import translations. DO NOT MERGE"
2020-05-09 06:22:43 +00:00
Bill Yi
ac58f8d984
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I7b1821919b07327e01a03ca9e34f14b5f8faa244
2020-05-09 04:13:54 +00:00
Chi Zhang
d00aeb9b51
[automerger skipped] Merge "Add telephony module" am: 5a097ffef6 am: 676c129a8e -s ours am: a491cc3d0a -s ours am: 5390cd0cb0 -s ours am: 50a7005a9a -s ours
...
am skip reason: Change-Id Ic078afd377d9d7d348b73a77ee1bfe2fa4e8f620 with SHA-1 a4efed8686
2020-05-09 03:54:51 +00:00
Bill Yi
4abf9fd36e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I233ae694aad2cbd93c2a425fa13955db7c953738
2020-05-09 03:53:22 +00:00
Chi Zhang
50a7005a9a
[automerger skipped] Merge "Add telephony module" am: 5a097ffef6 am: 676c129a8e -s ours am: a491cc3d0a -s ours am: 5390cd0cb0 -s ours
...
am skip reason: Change-Id Ic078afd377d9d7d348b73a77ee1bfe2fa4e8f620 with SHA-1 a4efed8686
2020-05-09 03:31:04 +00:00
Chi Zhang
5390cd0cb0
[automerger skipped] Merge "Add telephony module" am: 5a097ffef6 am: 676c129a8e -s ours am: a491cc3d0a -s ours
...
am skip reason: Change-Id Ic078afd377d9d7d348b73a77ee1bfe2fa4e8f620 with SHA-1 a4efed8686
2020-05-09 03:15:58 +00:00
Chi Zhang
a491cc3d0a
[automerger skipped] Merge "Add telephony module" am: 5a097ffef6 am: 676c129a8e -s ours
...
am skip reason: Change-Id Ic078afd377d9d7d348b73a77ee1bfe2fa4e8f620 with SHA-1 a4efed8686
2020-05-09 03:01:06 +00:00
Xiangyu/Malcolm Chen
32eabf3935
Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8 am: 99b0cf2dc8 am: 8d6fa82d6e am: 3337a62b66
...
Change-Id: I2ea29d76a244b0b3e3af859ce1a94272616c1385
2020-05-09 02:46:32 +00:00
Chi Zhang
676c129a8e
Merge "Add telephony module" am: 5a097ffef6
...
Change-Id: I9da4c8998b47447b407cb2606edc498ca241ab1a
2020-05-09 02:36:36 +00:00
Xiangyu/Malcolm Chen
3337a62b66
Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8 am: 99b0cf2dc8 am: 8d6fa82d6e
...
Change-Id: I4ff31e2dcdee9ea4ba43c3b619ae77aef32d7a6b
2020-05-09 02:27:37 +00:00
Chi Zhang
5a097ffef6
Merge "Add telephony module"
2020-05-09 02:24:34 +00:00
Xiangyu/Malcolm Chen
8d6fa82d6e
Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8 am: 99b0cf2dc8
...
Change-Id: I358ec596601fe4e0433dc2f000b6cf1b9010e373
2020-05-09 02:17:05 +00:00
Xiangyu/Malcolm Chen
99b0cf2dc8
Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8
...
Change-Id: Ib34c296ab404bdabc69823448c16320e80deacd1
2020-05-09 02:03:51 +00:00
Xiangyu/Malcolm Chen
6a5a8d74a8
Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e
...
Change-Id: I2dd958aa9f8d97ab4f476ad50afed3f884c189d9
2020-05-09 01:47:54 +00:00
Xiangyu/Malcolm Chen
414a71126e
Merge "Rename max.active.modems to active_modems.max_count"
2020-05-09 01:30:12 +00:00
Amit Mahajan
59c2805eeb
[automerger skipped] Merge "Add support for pdp reject retry feature" am: 37a3fd2902 -s ours am: 9e6904692e -s ours am: 9acfd62cff -s ours am: 3b31379c13 -s ours am: 1ed8327bf4 -s ours
...
am skip reason: Change-Id I0c897589852acecab41bdbf20c8abda7f53c20ab with SHA-1 63d9e496f3
2020-05-09 01:12:49 +00:00
Amit Mahajan
1ed8327bf4
[automerger skipped] Merge "Add support for pdp reject retry feature" am: 37a3fd2902 -s ours am: 9e6904692e -s ours am: 9acfd62cff -s ours am: 3b31379c13 -s ours
...
am skip reason: Change-Id I0c897589852acecab41bdbf20c8abda7f53c20ab with SHA-1 63d9e496f3
2020-05-09 00:58:22 +00:00
Amit Mahajan
3b31379c13
[automerger skipped] Merge "Add support for pdp reject retry feature" am: 37a3fd2902 -s ours am: 9e6904692e -s ours am: 9acfd62cff -s ours
...
am skip reason: Change-Id I0c897589852acecab41bdbf20c8abda7f53c20ab with SHA-1 63d9e496f3
2020-05-09 00:46:10 +00:00
Greg Kaiser
854a0f84f4
[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours am: 841c79b005 am: 75577cb1bf am: 7679a75949 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibec38010f2032ab500d1d90e9df0ae32935d1752
2020-05-09 00:45:52 +00:00
Greg Kaiser
7679a75949
[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours am: 841c79b005 am: 75577cb1bf
...
Change-Id: I35e8fc8dd8a4ae939fbed7faf0ac7acebc716c4c
2020-05-09 00:31:54 +00:00
Amit Mahajan
9acfd62cff
[automerger skipped] Merge "Add support for pdp reject retry feature" am: 37a3fd2902 -s ours am: 9e6904692e -s ours
...
am skip reason: Change-Id I0c897589852acecab41bdbf20c8abda7f53c20ab with SHA-1 63d9e496f3
2020-05-09 00:31:45 +00:00
Amit Mahajan
9e6904692e
[automerger skipped] Merge "Add support for pdp reject retry feature" am: 37a3fd2902 -s ours
...
am skip reason: Change-Id I0c897589852acecab41bdbf20c8abda7f53c20ab with SHA-1 63d9e496f3
2020-05-09 00:19:53 +00:00
Greg Kaiser
75577cb1bf
[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours am: 841c79b005
...
Change-Id: I8bc84c5fb70ef86a8ea2140ff3421e3c8adb7ceb
2020-05-09 00:19:19 +00:00
Greg Kaiser
841c79b005
[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifaddd883136cac51322417242e7eb9570deedee0
2020-05-09 00:04:37 +00:00
Amit Mahajan
37a3fd2902
Merge "Add support for pdp reject retry feature"
2020-05-09 00:02:23 +00:00
Greg Kaiser
8e5b9c5e76
Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master
2020-05-08 23:51:02 +00:00
Winson Chiu
b61abb9ab7
Merge "Disable test until APK prebuilts udpated" into rvc-dev-plus-aosp am: 21b305f096 am: 4bf50fb65c am: 4c994d47d0
...
Change-Id: I1773a1a704916b73235f38e6e73bb29a3dce3f33
2020-05-08 23:42:01 +00:00
Greg Kaiser
76df99e11c
[DO NOT MERGE] Revert "Make libstatssocket shared"
...
This reverts commit 3944f2d907https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/11419426/1
Test: Local 'm -j71 out/soong/.intermediates/frameworks/base/tools/stats_log_api_gen/libstatslog/android_arm64_armv8-a_shared_com.android.bluetooth.updatable/unstripped/libstatslog.so'
Bug: 156091657
Change-Id: I076a3b57123c329ecc68ae36f081f642ac2c48fb
2020-05-08 16:36:40 -07:00
Winson Chiu
4c994d47d0
Merge "Disable test until APK prebuilts udpated" into rvc-dev-plus-aosp am: 21b305f096 am: 4bf50fb65c
...
Change-Id: I6e6d77e78f9f7ef3d9b3a79c0d63c31391572e2c
2020-05-08 23:29:56 +00:00
Winson Chiu
4bf50fb65c
Merge "Disable test until APK prebuilts udpated" into rvc-dev-plus-aosp am: 21b305f096
...
Change-Id: I5b655d9608854632871c1a735c5021863626319f
2020-05-08 23:19:09 +00:00
Winson Chiu
21b305f096
Merge "Disable test until APK prebuilts udpated" into rvc-dev-plus-aosp
2020-05-08 23:07:24 +00:00
Adam Bookatz
508ed6c4ef
Merge "UserTypeDetails.dump restrictions for SYSTEM"
2020-05-08 22:01:01 +00:00
Adam Bookatz
128faad58d
Merge "Add bookatz@ to UserManagerService OWNERS" am: a775840882 am: 5e081b6669 am: c4f6fa9d3d am: 5ca1e09d09 am: b8553a66f9
...
Change-Id: I5c28bdff47fab247058928db1be9b96ba3c48ba8
2020-05-08 21:57:27 +00:00
Svet Ganov
45fe6b817d
Disable test until APK prebuilts udpated
...
Test: N/A
bug:155935153
Change-Id: I5f0493e3eeb7a6746ef2d0c62bcc33a97c1ba84e
2020-05-08 21:46:05 +00:00
Adam Bookatz
b8553a66f9
Merge "Add bookatz@ to UserManagerService OWNERS" am: a775840882 am: 5e081b6669 am: c4f6fa9d3d am: 5ca1e09d09
...
Change-Id: I180f54cbd8571eee409bbf745b419ae1ebe6721e
2020-05-08 21:43:36 +00:00
Adam Bookatz
5ca1e09d09
Merge "Add bookatz@ to UserManagerService OWNERS" am: a775840882 am: 5e081b6669 am: c4f6fa9d3d
...
Change-Id: I5f3e5256547d6474a9568ad8ef45e7fbe02cc667
2020-05-08 21:26:38 +00:00
Adam Bookatz
c4f6fa9d3d
Merge "Add bookatz@ to UserManagerService OWNERS" am: a775840882 am: 5e081b6669
...
Change-Id: Id0f5db519a94bd839abac696ec6c0c20e0265cd9
2020-05-08 21:09:38 +00:00
Adam Bookatz
5e081b6669
Merge "Add bookatz@ to UserManagerService OWNERS" am: a775840882
...
Change-Id: Ia8ad966bf812922b4e43021a73df207c31b4eb7d
2020-05-08 20:57:30 +00:00
Adam Bookatz
a775840882
Merge "Add bookatz@ to UserManagerService OWNERS"
2020-05-08 20:44:00 +00:00
Adam Bookatz
eb80e75324
UserTypeDetails.dump restrictions for SYSTEM
...
The SYSTEM user does not get its default restrictions
from UserTypeDetails.mDefaultRestrictions; rather it gets
it from config_defaultFirstUserRestrictions. Therefore, we
now dump those restrictions from the latter (instead of
the former) for the SYSTEM user.
Fixes: 146793707
Test: manual check of: adb shell dumpsys user
Change-Id: I5cf04d20fe9edd748803634ec80336b267695ce6
2020-05-08 12:30:37 -07:00
Jay Aliomer
6cbadcb8c8
Merge "Revert "Allow SUW to change dark theme"" into rvc-dev am: 1d555b86cb am: ce3b993d78 am: 6e7f15181a am: 0aeeb54d7a
...
Change-Id: I60fbe246e8470013a2838f500509090ada164cf0
2020-05-08 18:42:23 +00:00
Ryan Mitchell
d7465318e6
Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba am: 98b076b85d am: 1da72bfb6c am: 9bb6fa9e89
...
Change-Id: I128110df8aa4c7f0d9abd144be3f4078e6d87ad6
2020-05-08 18:41:04 +00:00
Jay Aliomer
0aeeb54d7a
Merge "Revert "Allow SUW to change dark theme"" into rvc-dev am: 1d555b86cb am: ce3b993d78 am: 6e7f15181a
...
Change-Id: I0dbe9b5ead3a2fe8dc6936ce9809f958a3214aed
2020-05-08 18:26:35 +00:00
Ryan Mitchell
9bb6fa9e89
Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba am: 98b076b85d am: 1da72bfb6c
...
Change-Id: I36b45909ab6218a755e707f1a2867818c6e5cde8
2020-05-08 18:25:25 +00:00
