Commit Graph

22504 Commits

Author SHA1 Message Date
Xin Li
5134815af5 DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug: 120502534
Change-Id: I4993ed4cbd133e995e950298c65ad57c73c9a5f3
2018-12-10 15:12:59 -08:00
Inseob Kim
8346eb5ccc Revert "Revert "Schematize vold system properties""
This reverts commit 49e81e0eea.

Reason for revert: Fixed breakage

Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
2018-12-10 13:03:37 +00:00
Anthony Stange
c7a5a2f39a Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3
am: a35a0418c1

Change-Id: I7ca5d4d85897ac4d2d851c05b9f69c986f6a662a
2018-12-07 04:38:25 -08:00
Anthony Stange
94ef16b6e3 Merge "Revert "Schematize vold system properties"" 2018-12-07 12:04:56 +00:00
Anthony Stange
49e81e0eea Revert "Schematize vold system properties"
This reverts commit e6baedd917.

Reason for revert: Breaking aosp_master build

Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b
2018-12-07 11:44:10 +00:00
Inseob Kim
cd614a097e Merge "Schematize vold system properties" am: 8cf17f7234
am: 09a7954114

Change-Id: I1a42e00ad024b471bcc51d8e0ef0f50fea34fcbe
2018-12-06 18:43:16 -08:00
Treehugger Robot
8cf17f7234 Merge "Schematize vold system properties" 2018-12-07 01:46:45 +00:00
Chen Xu
62dc239377 Merge "address API council feedbacks for Telephony.Carriers" am: 71f9fe4dfa
am: 1bf36a6a72

Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4
2018-12-06 16:39:36 -08:00
Chen Xu
71f9fe4dfa Merge "address API council feedbacks for Telephony.Carriers" 2018-12-06 21:45:47 +00:00
Fan Zhang
bd363f4925 Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
(cherry picked from commit 4220b1e50c)
2018-12-05 05:14:17 +00:00
Fan Zhang
4036866211 Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f21256
am: b084c60686

Change-Id: Ia3990dc8fa2c73079b997bda0e1656d173c65212
2018-12-04 10:10:50 -08:00
Fan Zhang
6db9f21256 Merge "Make migrate option menu invisible when src volume is not mounted" 2018-12-04 17:33:33 +00:00
chen xu
54d5a727c1 address API council feedbacks for Telephony.Carriers
Bug: 118296421
Test: telephony unit test
Change-Id: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Merged-in: Idf8bcad4fe9d765a73563e9b0c1c659175835447
2018-11-29 23:20:13 -08:00
Neil Fuller
18a275efc3 Merge "Track move of timezone classes to libcore.timezone" am: 3ddcb6a90a
am: de0bd5321f

Change-Id: I69516fa31c07a67621e8740ca14c19c40d5dd126
2018-11-26 15:48:38 -08:00
Neil Fuller
3ddcb6a90a Merge "Track move of timezone classes to libcore.timezone" 2018-11-26 23:04:33 +00:00
Youming Ye
e5e4e4cb76 Merge "Display a toast to notify user that Preset APN setting cannot be viewed" am: a995cb334b
am: e29c62ea04

Change-Id: If37a038a2a226d0165293d7c40f133002bcd2991
2018-11-26 13:51:57 -08:00
Neil Fuller
17f04b66b2 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Merged-In: I920411dfa7e000a0da9678826a035e0461211619
Change-Id: I920411dfa7e000a0da9678826a035e0461211619
(cherry picked from commit 1e1961a5b3)
2018-11-22 10:05:12 +00:00
taiki tsutsumi
4d044ced6d Display a toast to notify user that Preset APN setting cannot be viewed
When KEY_HIDE_PRESET_APN_DETAILS_BOOL is set to true, Preset APN setting
is hidden. When user taps Preset APN, a toast should be shown to inform
that user cannot view the APN.

Test: manual - check Preset APN setting details are hidden
Bug: 115453290
Depends-On: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
Change-Id: I0078b3492ae87a4297f24871b8bea1579e6a79af
2018-11-21 15:40:58 -08:00
Inseob Kim
e6baedd917 Schematize vold 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: Id2a696c621015d46015d5de0e7aef987e9e01b54
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
2018-11-14 12:05:28 +09:00
Risan
1670c69b7c Merge "Allow StubVolume to be browseable in Settings" am: 8f516adef7
am: e613923d66

Change-Id: I8eea682dec3eba70a2d44c32ba6e28641118300a
2018-11-13 11:57:54 -08:00
Treehugger Robot
8f516adef7 Merge "Allow StubVolume to be browseable in Settings" 2018-11-13 19:20:38 +00:00
Neil Fuller
e451323669 Merge "Remove the feature flag and dead code for the old time zone picker" am: 6bb4b5ca43
am: 78e132773a

Change-Id: Ie8890265b7dd1b5248ccef4dbb0f6fd58da55f85
2018-11-13 02:03:38 -08:00
Victor Chang
fe627a5901 Remove the feature flag and dead code for the old time zone picker
This commit backports commit 6be6c58206
to aosp/master.

Bug: 72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit 6be6c58206)
2018-11-13 07:49:32 +00:00
Youming Ye
502ad46dc1 Merge "Fix issue that read-only apns can be edited" am: e871464053
am: 6b0237ebfb

Change-Id: Id45080ae655a90bbdc3bf1601bc4aff33c42de3e
2018-11-08 17:32:00 -08:00
Youming Ye
e871464053 Merge "Fix issue that read-only apns can be edited" 2018-11-09 01:00:35 +00:00
Risan
9deece9086 Allow StubVolume to be browseable in Settings
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug: 110380403

Change-Id: I96fc82e731225776ac7070ef035687f83da94245
2018-11-08 21:47:22 +00:00
Fan Zhang
75fbb4511c Fix crash when starting daydream setting with wrong context
am: d9c6692f25

Change-Id: I723b66eced5ace06f5821463c3dd783a18496327
2018-11-07 10:51:48 -08:00
Clown SHEN
4f2055500a Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c
am: 74fe4a9177

Change-Id: Ib61988a9f84ed10d4ac0d6b1a0d8b7d4f8897224
2018-11-06 23:35:41 -08:00
Fan Zhang
d9c6692f25 Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.

Change-Id: I3e2de5068f44010da7d57af030e9f029dd97a7f8
Merged-In: I28874f296da617f4cedf6706b0663b76671f1780
Fixes: 111375261
Fixes: 113312592
Test: robotests
2018-11-06 23:47:24 +00:00
Yuming Mao
8d1eee08f7 Fix issue that read-only apns can be edited
When entering to ApnEditor with ApnSettings#onPreferenceTreeClick(),
subId is not passed.
So invalid subId is used and it gets wrong carrier config values.

To resolve this issue, remove unnecessary ApnSettings click event.
The only click event for launching ApnEditor is ApnPreference click
event.

Test: manual - Check that the read-only APN can't be edited when tap
the edge of the APN settings screen
Bug: 117302653
Change-Id: I0a61b409539d6e4f6aa9860235e61c43c76640fa
2018-11-02 19:56:11 +09:00
clownshen
95f8c6e96a Launch WfcActivation with subscription ID
For multi SIM project, need to have subscription ID information in the
intent for launching WFC activation activity.

Bug: 112826472
Test: manual test
Change-Id: I9f470c014054efa612c87ff16e574fc9fd286b3d
2018-10-31 13:28:09 +08:00
Lei Yu
73c361b544 Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"
This reverts commit e81224d80c.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-29 20:35:24 +00:00
Lei Yu
e81224d80c resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp
Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-25 14:25:21 -07:00
Bill Yi
8b16aba0dd Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
2018-10-24 14:47:27 -07:00
Fan Zhang
4c95f60b9e Merge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44
am: c150f5eb29

Change-Id: Ia4e59e195720919f2baa52e7d5667aed27c5ce7c
2018-10-23 19:30:39 -07:00
Fan Zhang
d5abc0eb44 Merge "Fix toast is covered by PIN code screen after wrong pin" 2018-10-24 02:16:57 +00:00
Hao Zhao
754930bc50 Fix toast is covered by PIN code screen after wrong pin
The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.

Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.

Bug: 74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a
2018-10-24 06:39:45 +09:00
Hall Liu
322091c7eb Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2
am: e419904aa0

Change-Id: I63428a32d201aa7260cc4aa96ad229e5bd83cf16
2018-10-18 15:31:05 -07:00
Hall Liu
e419904aa0 Merge "Start using CarrierConfig for 4G/LTE icon"
am: 558535f3f2

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
2018-10-18 14:56:56 -07:00
Hall Liu
558535f3f2 Merge "Start using CarrierConfig for 4G/LTE icon" 2018-10-18 20:36:06 +00:00
Stanley Tng
81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
Stanley Tng
0cc7d9a2af resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
2018-10-16 15:31:00 +00:00
Stanley Tng
a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
jackqdyulei
820e22d324 Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API

Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.

Bug: 115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-15 16:58:21 -07:00
Treehugger Robot
019a771d2d Merge "Add Feature Flag for Hearing Aid Profile" 2018-10-15 23:10:41 +00:00
Stanley Tng
a6c927b51a Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-15 22:51:02 +00:00
Youming Ye
6293483fce Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
am: 8bac59265e

Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a
2018-10-15 10:59:04 -07:00
Youming Ye
8bac59265e Merge "Fix error message shown when SIM PIN enable/disable fails"
am: f29392303a

Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
2018-10-15 10:42:52 -07:00
Youming Ye
f29392303a Merge "Fix error message shown when SIM PIN enable/disable fails" 2018-10-15 17:08:22 +00:00