Commit Graph

46029 Commits

Author SHA1 Message Date
android-build-team Robot
9d54cdbac0 Snap for 4945494 from 8143665d70 to pi-qpr1-release
Change-Id: Iacc373bf13a5e57e3c4febb8690c9d70f2f27341
2018-08-10 03:14:56 +00:00
Zhaoyu Su
2c23e6ab75 Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a
am: b69559f882

Change-Id: Ia7b74d284a1385dc401eb168d82fc9cb8756192f
2018-08-09 16:31:49 -07:00
Zhaoyu Su
b69559f882 Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
am: 44360bc96a

Change-Id: I6975c5213f74d4b9df343cae82d93f654774d1c3
2018-08-09 16:20:45 -07:00
Doris Ling
8143665d70 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours am: 2ef0e15b66 -s ours
am: bea56da7d6  -s ours

Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072
2018-08-09 15:32:03 -07:00
Doris Ling
bea56da7d6 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours
am: 2ef0e15b66  -s ours

Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
2018-08-09 15:26:36 -07:00
Doris Ling
2ef0e15b66 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am: 62158f0943  -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
2018-08-09 15:19:19 -07:00
TreeHugger Robot
62158f0943 Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev 2018-08-09 21:51:32 +00:00
Treehugger Robot
44360bc96a Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" 2018-08-09 21:37:17 +00:00
Doris Ling
8c84949c84 [automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
am: 38b9504a41  -s ours

Change-Id: I4b2ec56d290a83730e111012dd5ab02855860c27
2018-08-09 13:08:34 -07:00
TreeHugger Robot
38b9504a41 Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev 2018-08-09 19:47:07 +00:00
Doris Ling
ce02bdc0cd Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f
am: 4a6da68af7

Change-Id: Iaa83729685f24a2504b9142c17f87452ac1d9d85
2018-08-09 12:14:46 -07:00
Doris Ling
ad04140966 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10
am: d1146af517

Change-Id: Ic63e27409f0e1b5fe3c4cb9d152c50d9f1cef351
2018-08-09 12:13:30 -07:00
Doris Ling
cfcfc6a677 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146
am: 0f0147213e  -s ours

Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
2018-08-09 12:11:59 -07:00
Doris Ling
4a6da68af7 Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053
am: 9245b98d0f

Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
2018-08-09 12:06:31 -07:00
Doris Ling
d1146af517 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
am: 78a7ee2f10

Change-Id: I82960fb637152698cb676fae82862408b1a2db75
2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f
am: cff5200146

Change-Id: I44df485b49098b69371d1248067e51559dcd4964
2018-08-09 12:03:48 -07:00
Doris Ling
9245b98d0f Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
am: 197a10b053

Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
2018-08-09 12:02:34 -07:00
Doris Ling
78a7ee2f10 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
am: 528be61eeb

Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
2018-08-09 12:00:42 -07:00
Doris Ling
cff5200146 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
am: 3672a1fe7f

Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
2018-08-09 11:58:38 -07:00
TreeHugger Robot
197a10b053 Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
  DO NOT MERGE Disable changing lock when device is not provisioned.
2018-08-09 18:43:34 +00:00
TreeHugger Robot
528be61eeb Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 skipped: 1b622b07be
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
  DO NOT MERGE Disable changing lock when device is not provisioned.
2018-08-09 18:34:12 +00:00
Jordan Liu
efd3dd02b6 Merge "Preserve leading 0s in mcc mnc" am: 593d767e15
am: c2a5c47290

Change-Id: Id1a84cc4cc55fef4167f28ab0e665ebffe5d2c05
2018-08-08 15:50:24 -07:00
Jordan Liu
c2a5c47290 Merge "Preserve leading 0s in mcc mnc"
am: 593d767e15

Change-Id: I97041a9f2a50d8448a95226e66162b55a42f841b
2018-08-08 15:46:32 -07:00
Jordan Liu
593d767e15 Merge "Preserve leading 0s in mcc mnc" 2018-08-08 22:21:40 +00:00
Jordan Liu
f546b97db9 Preserve leading 0s in mcc mnc
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
2018-08-08 11:35:15 -07:00
Zhaoyu Su
0a9f87667f Fix ACTION_NFC_SETTINGS doesn't show connection preference
NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.

Test: send intent with action "android.settings.NFC_SETTINGS"
Bug: 111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
2018-08-08 18:42:27 +09:00
Xin Li
ffc0419e4f Merge "Merge Android Pie into master" am: eae6f13389
am: b745578205

Change-Id: I6da67456fef37ea0df3b003c0190692e9aeaf571
2018-08-07 18:37:11 -07:00
Xin Li
b745578205 Merge "Merge Android Pie into master"
am: eae6f13389

Change-Id: I8da592027bd7658b9d900aa8fae529c4bf7a6a7d
2018-08-07 15:06:54 -07:00
Fan Zhang
f722e59a51 Fix memory leaks in Settings
Bug: 80507279
Test: inspected hprof before and after fix
Change-Id: I6ea2925695deb6261263649e858484e1667ec522
Merged-In: I6ea2925695deb6261263649e858484e1667ec522
2018-08-07 18:06:56 +00:00
Xin Li
eae6f13389 Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Xin Li
40a1c33e24 Merge Android Pie into master
Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
2018-08-06 16:51:22 -07:00
Bill Yi
16191b3408 [automerger skipped] Import translations. DO NOT MERGE
am: 000f97dcf9  -s ours

Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
2018-08-04 18:21:26 -07:00
Bill Yi
000f97dcf9 Import translations. DO NOT MERGE
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
2018-08-04 07:43:29 -07:00
Android Build Merger (Role)
36a583e2ff [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 skipped: 1b622b07be
Change-Id: I2755a79cc942e8dc063f3a420e0ed02817959cec
2018-08-03 21:04:11 +00:00
Android Build Merger (Role)
1b622b07be [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
2018-08-03 21:04:09 +00:00
Android Build Merger (Role)
aaa67659a6 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
2018-08-03 21:04:08 +00:00
Android Build Merger (Role)
782fc16dc4 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
2018-08-03 21:04:06 +00:00
Android Build Merger (Role)
c056ac3011 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
2018-08-03 21:04:04 +00:00
Doris Ling
c624deaff5 DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 14:03:37 -07:00
Doris Ling
cb68db7d4f DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 12:55:42 -07:00
Doris Ling
fff37ccb31 Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 12:25:41 -07:00
Android Build Merger (Role)
8da82c40cc [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9
2018-08-03 01:03:04 +00:00
Android Build Merger (Role)
3503445e59 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f
2018-08-03 01:03:02 +00:00
Android Build Merger (Role)
d98908e7c7 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a
2018-08-03 01:03:00 +00:00
Doris Ling
cd0b97e86f DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-03 01:02:58 +00:00
Android Build Merger (Role)
3672a1fe7f [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece
2018-08-03 01:00:48 +00:00
Doris Ling
94ea2dad5b DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-02 18:00:29 -07:00
Doris Ling
770f4abf9d Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-01 10:30:51 -07:00
android-build-team Robot
d276458c27 Snap for 4916303 from 0a8de9d763 to pi-qpr1-release
Change-Id: Idbb0c2f838e3b48caf9404e69155e5f665570343
2018-07-27 03:05:35 +00:00
Dario Freni
1237373743 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours
am: 1e56e69a46  -s ours

Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
2018-07-24 04:02:45 -07:00