Joe Onorato
f51826853b
Add additional anomaly types.
...
Test: Treehugger
Bug: 115540658
Change-Id: I369f5bfadfe10810aa33d4127fb9ce69c9c57e7e
2019-02-25 14:51:10 +00:00
Xin Li
fc53be7b56
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
2019-02-23 00:39:23 +00:00
Youming Ye
e3844769e6
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
...
am: 5b3ee7afaa
2019-02-22 14:14:11 -08:00
Youming Ye
5b3ee7afaa
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
2019-02-22 21:53:12 +00:00
Bill Yi
1b7db3cb3e
[automerger skipped] Import translations. DO NOT MERGE
...
am: 02681df33f
2019-02-21 18:14:54 -08:00
Wenting Xiong
82aa55bcda
Fix issue that the wifi calling text cannot be customized based on sim
...
Some carriers have requirements that the wifi calling text should be
customizable. However, the resources for the wifi calling text are
not obtained based on sim. So it cannot be customized per sim for multi
sim device. To solve this issue, obtain the resources with specified
sim.
Test: manual - Checked that the wifi calling text could be customized
based on sim.
Bug: 117257109
Change-Id: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
Merged-In: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
2019-02-22 01:57:44 +00:00
Bill Yi
02681df33f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
2019-02-21 16:40:33 -08:00
Xin Li
1994397e6a
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I6eeee632ff6ee7f2d7395344a7887c44c7acd440
2019-02-21 11:03:43 -08:00
Kiyoung Kim
9602f7eb0b
Merge "Schematize Crypto system properties" am: b837a44716
...
am: a078a02c42
2019-02-20 17:07:08 -08:00
Kiyoung Kim
a078a02c42
Merge "Schematize Crypto system properties"
...
am: b837a44716
2019-02-20 16:34:01 -08:00
Kiyoung Kim
b837a44716
Merge "Schematize Crypto system properties"
2019-02-21 00:16:45 +00:00
Android Build Merger (Role)
ba87cf7444
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8
...
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
2019-02-20 21:54:41 +00:00
Android Build Merger (Role)
d6bde3f5b8
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837
...
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
2019-02-20 21:54:39 +00:00
Android Build Merger (Role)
7926131837
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114
...
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
2019-02-20 21:54:37 +00:00
Android Build Merger (Role)
7a58589114
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f
...
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
2019-02-20 21:54:34 +00:00
Android Build Merger (Role)
b810aee20f
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
...
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
2019-02-20 21:54:31 +00:00
Fan Zhang
95d0fb7f49
Do not allow draw on top for default sms picker.
...
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe
2019-02-20 13:53:51 -08:00
Xin Li
b637de1cb8
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d4716c1a62 -s ours
...
am: 92fc138524
2019-02-20 11:47:29 -08:00
Xin Li
92fc138524
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
...
am: d4716c1a62
2019-02-20 11:06:41 -08:00
Xin Li
3003b4b39c
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 9d8c2cc2c6 -s ours
...
am: a99376f647
2019-02-20 09:29:00 -08:00
Xin Li
a99376f647
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 9d8c2cc2c6
2019-02-20 08:52:26 -08:00
Xin Li
d4716c1a62
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
2019-02-20 16:25:59 +00:00
Xin Li
9d8c2cc2c6
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd
2019-02-18 15:58:44 -08:00
Kiyoung Kim
9c9b9394de
Schematize Crypto system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
Merged-In: I65a6ce1a682687702f4c8b5c2e054eaaf91c389b
2019-02-15 02:30:30 +00:00
Xin Li
82b262afbd
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
...
am: f6aad2aee8
2019-02-14 17:18:04 -08:00
Xin Li
44ace71846
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: d61c2adf09
2019-02-14 14:41:06 -08:00
Xin Li
f6aad2aee8
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
2019-02-14 22:11:39 +00:00
Brad Ebinger
9f2b104953
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am: db7da4cba8
...
am: ee4a5291a1
2019-02-14 13:19:37 -08:00
Brad Ebinger
ee4a5291a1
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
...
am: db7da4cba8
2019-02-14 13:15:44 -08:00
Brad Ebinger
db7da4cba8
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
2019-02-14 21:01:05 +00:00
Xin Li
d61c2adf09
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
2019-02-14 00:03:58 -08:00
markchien
c77ee11e4e
Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627
...
am: 2ee5beaa32
2019-02-13 22:39:00 -08:00
markchien
2ee5beaa32
Merge "Fix wrong TetherProvisioningActivity definition"
...
am: f1e3e9d627
2019-02-13 22:34:49 -08:00
Treehugger Robot
f1e3e9d627
Merge "Fix wrong TetherProvisioningActivity definition"
2019-02-14 06:19:30 +00:00
markchien
8c713fc756
Fix wrong TetherProvisioningActivity definition
...
Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
2019-02-14 03:24:52 +00:00
Hall Liu
89b61e8e0a
Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3
...
am: 5232a30b03
2019-02-13 16:33:22 -08:00
Hall Liu
5232a30b03
Merge "Add ACCESS_FINE_LOCATION to permissions"
...
am: a23ceba5c3
2019-02-13 16:14:10 -08:00
Hall Liu
a23ceba5c3
Merge "Add ACCESS_FINE_LOCATION to permissions"
2019-02-13 23:21:43 +00:00
Fan Zhang
798c93aafc
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82
...
am: 32fbf4740d
2019-02-13 10:29:46 -08:00
Fan Zhang
32fbf4740d
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
...
am: dabfd96c82
2019-02-13 10:16:15 -08:00
Fan Zhang
dabfd96c82
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834
Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
...
This reverts commit 910457e37ahttps://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
2019-02-13 17:59:40 +00:00
Mark Chien
edc4fd30ea
Merge "Support entitlement check in DSDS" am: e3b4e0262c
...
am: 0ac1c323b2
2019-02-12 20:06:32 -08:00
Fan Zhang
80fd417a58
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
...
am: dd3e2c4f27
2019-02-12 19:33:56 -08:00
Mark Chien
0ac1c323b2
Merge "Support entitlement check in DSDS"
...
am: e3b4e0262c
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
...
am: 3905ad125d
2019-02-12 18:41:40 -08:00
Mark Chien
e3b4e0262c
Merge "Support entitlement check in DSDS"
2019-02-13 02:29:01 +00:00
Kiyoung Kim
de1971d7a0
Merge "Schematize ADB system properties" am: 750b90a22b
...
am: 974ace22f9
2019-02-12 18:18:16 -08:00
Kiyoung Kim
974ace22f9
Merge "Schematize ADB system properties"
...
am: 750b90a22b
2019-02-12 18:06:33 -08:00
Fan Zhang
3905ad125d
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
2019-02-13 00:12:08 +00:00
