OSDN Git Service
Qingxi Li [Thu, 28 Mar 2019 00:56:15 +0000 (17:56 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset" am:
bdef91f964 -s ours
am:
bd5f4328f5 -s ours
am skip reason: subject contains skip directive
Change-Id: I23f3800d8bd6432c7aa9a59ae7cee29e73c7c834
Qingxi Li [Thu, 28 Mar 2019 00:46:52 +0000 (17:46 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset"
am:
bdef91f964 -s ours
am skip reason: subject contains skip directive
Change-Id: I362517c36ff77b36336fcc52a684dd29b50bab94
Treehugger Robot [Thu, 28 Mar 2019 00:27:30 +0000 (00:27 +0000)]
Merge "[DO NOT MERGE] Fix the typo of the error message of eSIM reset"
Qingxi Li [Wed, 27 Mar 2019 21:40:30 +0000 (14:40 -0700)]
[DO NOT MERGE] Fix the typo of the error message of eSIM reset
Bug:
129085179
Test: N/A
Change-Id: Iad8fdc7368a4d91aff9eb3035bfe91592d6bce1b
Bill Yi [Mon, 25 Mar 2019 05:38:25 +0000 (22:38 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e6d11ed962 -s ours
am skip reason: subject contains skip directive
Change-Id: I144c24a4b3c2dcab4693d0f5eb45a2df29b2c380
Bill Yi [Sun, 24 Mar 2019 22:43:53 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
Lucas Lin [Fri, 22 Mar 2019 01:43:39 +0000 (18:43 -0700)]
Merge "Modify dialog message for partial connectivity" am:
f467ee4a28
am:
8701e18275
Change-Id: Icd481ce4dc83b0d60ffeef75bbcfe9277339e4f6
Lucas Lin [Fri, 22 Mar 2019 01:31:47 +0000 (18:31 -0700)]
Merge "Modify dialog message for partial connectivity"
am:
f467ee4a28
Change-Id: I9a022578e14327bfe98a3efa74a99d9f623a031e
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify dialog message for partial connectivity"
lucaslin [Wed, 20 Mar 2019 03:41:21 +0000 (11:41 +0800)]
Modify dialog message for partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.
Bug:
113450764
Bug:
128489091
Test: 1. Build pass.
2. make -j44 RunSettingsRoboTests
ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
3. Change captive_portal_https_url to https://invalid.com
to simulate partial connectivity.
Change-Id: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
Merged-In: I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1
Brad Ebinger [Mon, 18 Mar 2019 20:42:49 +0000 (13:42 -0700)]
Merge "Do not show Provisioning items for IMS if it is not enabled." am:
be10b45fe6
am:
76b4661f56
Change-Id: I04d7e91cce1424608581ca36f6282e71c9d3ac7e
Brad Ebinger [Mon, 18 Mar 2019 20:29:25 +0000 (13:29 -0700)]
Merge "Do not show Provisioning items for IMS if it is not enabled."
am:
be10b45fe6
Change-Id: Ie8c404d980d7437550019fccdcac0868fa5d845d
Brad Ebinger [Mon, 18 Mar 2019 17:35:27 +0000 (17:35 +0000)]
Merge "Do not show Provisioning items for IMS if it is not enabled."
Hall Liu [Sat, 16 Mar 2019 00:37:37 +0000 (17:37 -0700)]
Merge "Base implementation of WFC disclaimer UI" am:
7e2c23aa0d
am:
257e6f71ee
Change-Id: Iceb8fffc425756e19b1a2bf16469b0cb69a444da
Hall Liu [Sat, 16 Mar 2019 00:33:26 +0000 (17:33 -0700)]
Merge "Base implementation of WFC disclaimer UI"
am:
7e2c23aa0d
Change-Id: Ib89de5bf801b6669795e7c49010136a0e966324a
Hall Liu [Sat, 16 Mar 2019 00:23:23 +0000 (00:23 +0000)]
Merge "Base implementation of WFC disclaimer UI"
manabu, shimoda [Wed, 8 Nov 2017 02:32:31 +0000 (11:32 +0900)]
Base implementation of WFC disclaimer UI
Test: manual - Check that no error occurred when changing the wifi
calling settings to turn on.
Test: auto - Passed WifiCallingSettingsForSubTest,
WifiCallingDisclaimerFragmentTest and DisclaimerItemListAdapterTest.
Bug:
67872298
Change-Id: I789f530d3e16baa6e56feaa4269f6696976f747e
Merged-In: I789f530d3e16baa6e56feaa4269f6696976f747e
Amit Mahajan [Fri, 15 Mar 2019 01:49:59 +0000 (18:49 -0700)]
Merge "Move SMS raw db deletion to phone process." am:
479ec92c27
am:
f784db5cae
Change-Id: Ib90080a6fad7ad8914390df8e4aa92749669f1a9
Amit Mahajan [Fri, 15 Mar 2019 01:45:50 +0000 (18:45 -0700)]
Merge "Move SMS raw db deletion to phone process."
am:
479ec92c27
Change-Id: I38689f5f833825eae230706b536c4ad1ded847bd
Treehugger Robot [Fri, 15 Mar 2019 01:25:28 +0000 (01:25 +0000)]
Merge "Move SMS raw db deletion to phone process."
Brad Ebinger [Tue, 12 Mar 2019 00:33:53 +0000 (17:33 -0700)]
Do not show Provisioning items for IMS if it is not enabled.
Do not show IMS related items if FEATURE_TELEPHONY_IMS
is not defined for this device.
Bug:
118823723
Test: manual
Merged-In: I9624535fe766cd79eadb30502c1a0574650a02ef
Change-Id: I9624535fe766cd79eadb30502c1a0574650a02ef
Amit Mahajan [Thu, 14 Mar 2019 00:32:39 +0000 (17:32 -0700)]
Move SMS raw db deletion to phone process.
Test: manual
Bug:
127929687
Change-Id: Ib23efc647fbd4b3007197932b9493393dc5b4d5b
Kiyoung Kim [Wed, 13 Mar 2019 05:09:21 +0000 (22:09 -0700)]
Merge "Schematize Crypto state system property" am:
6c38df5eff
am:
7dc288a899
Change-Id: I865d37316469126cf1cd1bf93bd7427882042c3d
Kiyoung Kim [Wed, 13 Mar 2019 04:34:09 +0000 (21:34 -0700)]
Merge "Schematize Crypto state system property"
am:
6c38df5eff
Change-Id: I3ef29bc153839fd18b1144c8128ddf4dbc1e4f60
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"
Hall Liu [Tue, 12 Mar 2019 22:52:22 +0000 (15:52 -0700)]
Merge "Add description for Wi-Fi calling mode" am:
13e02af2ad
am:
a10d7031c3
Change-Id: I18deb6cc090f077ed6d49decdadf7d642075ec5a
Hall Liu [Tue, 12 Mar 2019 21:06:12 +0000 (14:06 -0700)]
Merge "Add description for Wi-Fi calling mode"
am:
13e02af2ad
Change-Id: Iff0a3e6f814a8fbd7b3910589c5e712cd9dc9b26
Hall Liu [Tue, 12 Mar 2019 20:49:21 +0000 (20:49 +0000)]
Merge "Add description for Wi-Fi calling mode"
Kazuya Ohshiro [Mon, 29 Aug 2016 09:29:35 +0000 (18:29 +0900)]
Add description for Wi-Fi calling mode
Replace the view of dialog with custom view that adds description
as summary.
Test: manual
Bug:
34793636
Change-Id: If9792b0a35c59c1260176b4b2c62107861de73b5
Merged-In: If9792b0a35c59c1260176b4b2c62107861de73b5
Fan Zhang [Fri, 8 Mar 2019 23:27:25 +0000 (15:27 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444 am:
9366d11e6d am:
657f8713ff
am:
1b29c28aef
Change-Id: I549324f01db9afe19e21c6c01f02ce3f2a444c33
Fan Zhang [Fri, 8 Mar 2019 23:07:53 +0000 (15:07 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444 am:
9366d11e6d
am:
657f8713ff
Change-Id: I501ba68b3f6691a627a8828aeca16d495ee52126
Fan Zhang [Fri, 8 Mar 2019 23:01:41 +0000 (15:01 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444
am:
9366d11e6d
Change-Id: Icd4cf6000dd9d72f486417f1d11dde008d49c513
Fan Zhang [Fri, 8 Mar 2019 22:55:32 +0000 (14:55 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8
am:
ba87cf7444
Change-Id: I3b3a2411f4be05e1b8f6ecfce3521c5932028038
Chalard Jean [Fri, 8 Mar 2019 15:44:56 +0000 (07:44 -0800)]
Merge "Support VPN Proxy(2/2)" am:
2a695c4b7b
am:
e2f74af063
Change-Id: I61f6f949ab79cdcac5d61ae9409c2de09b75db49
Chalard Jean [Fri, 8 Mar 2019 14:42:57 +0000 (06:42 -0800)]
Merge "Support VPN Proxy(2/2)"
am:
2a695c4b7b
Change-Id: I58553c28c8f4e87a52169f925da70c2edb89ca71
Brad Ebinger [Fri, 8 Mar 2019 14:35:14 +0000 (06:35 -0800)]
Merge "WFC roaming mode setting can not be used with a fixed value" am:
7296b6cb1c
am:
3c65dc51f3
Change-Id: I3ffc4a17603e174eec58acfb33e23be86cd0f73f
Brad Ebinger [Fri, 8 Mar 2019 14:08:40 +0000 (06:08 -0800)]
Merge "WFC roaming mode setting can not be used with a fixed value"
am:
7296b6cb1c
Change-Id: I0b4bd383fe9ac1e057e652664fc3fb0a250f1eeb
Chalard Jean [Fri, 8 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Support VPN Proxy(2/2)"
Brad Ebinger [Thu, 7 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge "WFC roaming mode setting can not be used with a fixed value"
Kitta Koutarou [Thu, 14 Feb 2019 10:16:40 +0000 (19:16 +0900)]
WFC roaming mode setting can not be used with a fixed value
WFC roaming mode setting can not be used with a fixed value because it
is changed as WFC home mode changes if
KEY_EDITABLE_WFC_ROAMING_MODE_BOOL is false.
To solve this issue, separate the WFC mode setting of home and roaming.
These can switch behavior by new carrier config
KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL.
Test: manual - Checked that WFC roaming mode is hidden if new config is
true.
Test: manual - Checked that WFC roaming mode is also changed when
change the WFC home mode if new config is true.
Test: auto - Passed WifiCallingSettingsForSubTest.
Bug:
79666081
Merged-In: Ib2363c5d50f5231cc89f287d760ca8728b02b249
Change-Id: Ib2363c5d50f5231cc89f287d760ca8728b02b249
Ryusuke Sawa [Thu, 27 Sep 2018 05:06:28 +0000 (14:06 +0900)]
Support VPN Proxy(2/2)
Adding VPN Proxy settings in advanced option.
- Proxy host name
- Proxy port
Bug:
118793208
Test: runtest
Change-Id: I40f3cf049f5822eefc3f9e6ba5dd0bb80c9b3945
Andrii Kulian [Sat, 2 Mar 2019 02:13:47 +0000 (18:13 -0800)]
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" am:
50a39ba9a9
am:
c307426ebe
Change-Id: I3888d6a447a5b9ea588ee0e93c4c0f91626f1b70
Andrii Kulian [Sat, 2 Mar 2019 02:03:12 +0000 (18:03 -0800)]
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
am:
50a39ba9a9
Change-Id: I92454274470675dbe533c0713d44c304f0cfaaf0
Andrii Kulian [Sat, 2 Mar 2019 01:52:04 +0000 (01:52 +0000)]
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""
Andrii Kulian [Sat, 2 Mar 2019 01:44:55 +0000 (01:44 +0000)]
Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
This reverts commit
e7fe45f4cad79a9f51d3f4b8c1b7917dd485bbf2.
Reason for revert: broke git_pi-dev-plus-aosp build
Change-Id: I390b0006bb780ce81520ea851f474e0188f0495e
Takamasa Kuramitsu [Sat, 2 Mar 2019 00:52:30 +0000 (16:52 -0800)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am:
b67697cf38
am:
b496699104
Change-Id: I4ad127ad793b1c154af8536b8b989aafd283e787
Takamasa Kuramitsu [Sat, 2 Mar 2019 00:29:52 +0000 (16:29 -0800)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
am:
b67697cf38
Change-Id: Ic1a3e5d5bd2660b8ed71b0650672321480d60adb
Treehugger Robot [Fri, 1 Mar 2019 21:48:55 +0000 (21:48 +0000)]
Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
Takamasa Kuramitsu [Fri, 1 Mar 2019 00:22:38 +0000 (00:22 +0000)]
Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
This reverts commit
1ea003e8347237e5f6a4a696aa741a32d169e620.
Fixes:
116821732
Reason for revert: blocking issue in b/
124370422 is resolved
Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b
Neil Fuller [Wed, 27 Feb 2019 19:10:27 +0000 (11:10 -0800)]
Merge "Update the timestamp used for time zone filtering" am:
51376aefc1
am:
d2b3df945c
Change-Id: Ibf0c0b2e1bedf25f8228e98bdb3644d0e090d135
Neil Fuller [Wed, 27 Feb 2019 19:01:42 +0000 (11:01 -0800)]
Merge "Update the timestamp used for time zone filtering"
am:
51376aefc1
Change-Id: I73413541d36f6caac85dd18c2f6d63adee67b95e
Treehugger Robot [Wed, 27 Feb 2019 18:45:08 +0000 (18:45 +0000)]
Merge "Update the timestamp used for time zone filtering"
Neil Fuller [Wed, 27 Feb 2019 14:58:45 +0000 (14:58 +0000)]
Update the timestamp used for time zone filtering
Update the timestamp used for time zone filtering and improve the
comment explaining what it is for.
Bug:
124756276
Test: build only
Change-Id: I2e53b1f3bd36602f8d08967e1335066d93ae05ea
Joe Onorato [Tue, 26 Feb 2019 07:00:09 +0000 (23:00 -0800)]
Merge "Add additional anomaly types." am:
64bf0a791e
am:
e709ac7a4c
Change-Id: I5b813e1357baae09566285dacb30e44169e9b16d
Joe Onorato [Tue, 26 Feb 2019 06:48:39 +0000 (22:48 -0800)]
Merge "Add additional anomaly types."
am:
64bf0a791e
Change-Id: Iebe3695669e87b3109b43becaf869c4b2f9a4b48
Kiyoung Kim [Fri, 22 Feb 2019 04:35:46 +0000 (13:35 +0900)]
Schematize Crypto state system property
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug:
117924132
Test: m -j
Change-Id: I5df6145a436c38dd9fed4325b02ac37a801c2f5e
Merged-In: I957a8e37a88f7bb6d5007a36c02952d3539580fe
Xin Li [Tue, 26 Feb 2019 03:17:55 +0000 (19:17 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
am:
fc53be7b56 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia25b02f0df97306066a4f52687ab55376b8bc3bb
Xin Li [Tue, 26 Feb 2019 00:18:26 +0000 (16:18 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
am:
1994397e6a -s ours
am skip reason: subject contains skip directive
Change-Id: I5c40623742c23696457c1fedb742322c634ed1f6
Youming Ye [Mon, 25 Feb 2019 21:08:32 +0000 (13:08 -0800)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim" am:
5b3ee7afaa
am:
e3844769e6
Change-Id: Id1d2e5e9a061d844ecc69eed35b2c36d61a0a416
Treehugger Robot [Mon, 25 Feb 2019 19:53:26 +0000 (19:53 +0000)]
Merge "Add additional anomaly types."
Joe Onorato [Tue, 5 Feb 2019 01:36:23 +0000 (17:36 -0800)]
Add additional anomaly types.
Test: Treehugger
Bug:
115540658
Change-Id: I369f5bfadfe10810aa33d4127fb9ce69c9c57e7e
Xin Li [Sat, 23 Feb 2019 00:39:23 +0000 (00:39 +0000)]
Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
Youming Ye [Fri, 22 Feb 2019 22:14:11 +0000 (14:14 -0800)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
am:
5b3ee7afaa
Change-Id: Iffac84438bf43372a1ddeb4df1ef9d85c9af2a2d
Youming Ye [Fri, 22 Feb 2019 21:53:12 +0000 (21:53 +0000)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
Bill Yi [Fri, 22 Feb 2019 02:14:54 +0000 (18:14 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
02681df33f -s ours
am skip reason: subject contains skip directive
Change-Id: Ib86fee981b4acd47fa9dc91011fe8d88fd7230c8
Wenting Xiong [Wed, 28 Nov 2018 09:22:21 +0000 (18:22 +0900)]
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
Bill Yi [Fri, 22 Feb 2019 00:40:33 +0000 (16:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
Xin Li [Thu, 21 Feb 2019 19:03:43 +0000 (11:03 -0800)]
DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
Bug:
120848293
Change-Id: I6eeee632ff6ee7f2d7395344a7887c44c7acd440
Kiyoung Kim [Thu, 21 Feb 2019 01:07:08 +0000 (17:07 -0800)]
Merge "Schematize Crypto system properties" am:
b837a44716
am:
a078a02c42
Change-Id: Ie498a453d85651904d98b0501d895e15cabfb317
Kiyoung Kim [Thu, 21 Feb 2019 00:34:01 +0000 (16:34 -0800)]
Merge "Schematize Crypto system properties"
am:
b837a44716
Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:41 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:39 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:37 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:34 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:31 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]
Do not allow draw on top for default sms picker.
Fixes:
120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit
9d46e1fdfe1b70618c5a92c3e3461a4b379db236)
Xin Li [Wed, 20 Feb 2019 19:47:29 +0000 (11:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am:
d4716c1a62 -s ours
am:
92fc138524 -s ours
am skip reason: subject contains skip directive
Change-Id: I1e1a98a476c0fcda84f8d5c1d245e296b0354708
Xin Li [Wed, 20 Feb 2019 19:06:41 +0000 (11:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am:
d4716c1a62 -s ours
am skip reason: subject contains skip directive
Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9
Xin Li [Wed, 20 Feb 2019 17:29:00 +0000 (09:29 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
9d8c2cc2c6 -s ours
am:
a99376f647 -s ours
am skip reason: subject contains skip directive
Change-Id: I70f7a0afed0ff3124670ac7da3a5a4d643b07970
Xin Li [Wed, 20 Feb 2019 16:52:26 +0000 (08:52 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am:
9d8c2cc2c6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic2e84fd1810cf9eb661c2c4b4b32755821cf17e3
Xin Li [Wed, 20 Feb 2019 16:25:59 +0000 (16:25 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Xin Li [Mon, 18 Feb 2019 23:58:44 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master
Bug:
124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd
Kiyoung Kim [Tue, 22 Jan 2019 01:19:29 +0000 (10:19 +0900)]
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
Xin Li [Fri, 15 Feb 2019 01:18:04 +0000 (17:18 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
am:
f6aad2aee8 -s ours
am skip reason: subject contains skip directive
Change-Id: I4bf7e0d090e49c1273ca1ad81bffe26825e34e47
Xin Li [Thu, 14 Feb 2019 22:41:06 +0000 (14:41 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am:
d61c2adf09 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia83108724808a1bb96ed25b0607545bda5abb7b9
Xin Li [Thu, 14 Feb 2019 22:11:39 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
Brad Ebinger [Thu, 14 Feb 2019 21:19:37 +0000 (13:19 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am:
db7da4cba8
am:
ee4a5291a1
Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33
Brad Ebinger [Thu, 14 Feb 2019 21:15:44 +0000 (13:15 -0800)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
am:
db7da4cba8
Change-Id: I0e3a787020b6631e25496d5c75b39cbda27f9b92
Brad Ebinger [Thu, 14 Feb 2019 21:01:05 +0000 (21:01 +0000)]
Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow"
Xin Li [Tue, 12 Feb 2019 22:54:28 +0000 (14:54 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug:
124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
markchien [Thu, 14 Feb 2019 06:39:00 +0000 (22:39 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition" am:
f1e3e9d627
am:
2ee5beaa32
Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
markchien [Thu, 14 Feb 2019 06:34:49 +0000 (22:34 -0800)]
Merge "Fix wrong TetherProvisioningActivity definition"
am:
f1e3e9d627
Change-Id: I3cc8c13e2a7ee50be4e3d1080232156ce6f30984
Treehugger Robot [Thu, 14 Feb 2019 06:19:30 +0000 (06:19 +0000)]
Merge "Fix wrong TetherProvisioningActivity definition"
markchien [Thu, 14 Feb 2019 03:11:31 +0000 (11:11 +0800)]
Fix wrong TetherProvisioningActivity definition
Bug:
122108346
Bug:
120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
Hall Liu [Thu, 14 Feb 2019 00:33:22 +0000 (16:33 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions" am:
a23ceba5c3
am:
5232a30b03
Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0
Hall Liu [Thu, 14 Feb 2019 00:14:10 +0000 (16:14 -0800)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
am:
a23ceba5c3
Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Add ACCESS_FINE_LOCATION to permissions"
Fan Zhang [Wed, 13 Feb 2019 18:29:46 +0000 (10:29 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am:
dabfd96c82
am:
32fbf4740d
Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
Fan Zhang [Wed, 13 Feb 2019 18:16:15 +0000 (10:16 -0800)]
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am:
dabfd96c82
Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
OSDN Git Service
