Commit Graph

45366 Commits

Author SHA1 Message Date
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
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
000f97dcf9 Import translations. DO NOT MERGE
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
2018-08-04 07:43:29 -07:00
Dario Freni
1e56e69a46 [automerger skipped] Merge "Include NOTICE file in /product partition."
am: aa2ec5f239  -s ours

Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239 Merge "Include NOTICE file in /product partition." 2018-07-24 10:35:44 +00:00
Chalard Jean
9971303508 Merge "Use the SSID of the network in the no internet dialog"
am: 692f989b98

Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
2018-07-20 12:25:39 -07:00
Treehugger Robot
692f989b98 Merge "Use the SSID of the network in the no internet dialog" 2018-07-20 18:57:09 +00:00
Brad Ebinger
15ca33865c Merge "IMS: Use the slot based ImsManager factory reset API."
am: 9e4ff6fca6

Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
2018-07-16 13:32:55 -07:00
Brad Ebinger
9e4ff6fca6 Merge "IMS: Use the slot based ImsManager factory reset API." 2018-07-16 19:57:31 +00:00
Hall Liu
f0072b7345 Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc

Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac)
2018-07-13 10:13:46 -07:00
xiamin
bfb61ed2ed Merge "new password shouldn't be empty string"
am: dd7bd6b15a

Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
2018-07-11 14:51:09 -07:00
Treehugger Robot
dd7bd6b15a Merge "new password shouldn't be empty string" 2018-07-11 20:23:29 +00:00
Dario Freni
e9d83796ac Include NOTICE file in /product partition.
Test: flashed on a device with /product partition and verified licences
are correctly loaded
Bug: 111179267

Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4
Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381
2018-07-11 10:52:53 +01:00
xiamin
3c2956a08c new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.

Bug: https://partnerissuetracker.corp.google.com/u/2/issues/111261338
Test: empty string can not be set as a password

Signed-off-by: xiamin <xiamin@xiaomi.com>
2018-07-10 10:48:56 +08:00
Daichi Ueura
01dfcc4ea9 Merge "Show Wifi 'Off' status properly just after boot"
am: 23482a54bb

Change-Id: Icc111b50f52f5ed801d63bedfac851ba5dcc99c1
2018-06-19 15:36:47 -07:00
Treehugger Robot
23482a54bb Merge "Show Wifi 'Off' status properly just after boot" 2018-06-19 21:55:17 +00:00
Daichi Ueura
f41d1605a3 Show Wifi 'Off' status properly just after boot
If Wifi is not enabled at boot, WIFI_STATE_CHANGED_ACTION
sticky intent is not present. This results in Wifi 'Off'
status is not shown. This patch handles such case by calling
notifyChangeIfNeeded at register to refresh status.

Bug: 110373099
Test: manual - Check status after device boot with wifi off
Change-Id: I009386b03ef3269b00ce403b86087664b295f397
2018-06-19 16:15:31 +09:00
Pengquan Meng
1fc6859126 Merge "Remove internal ApnSetting."
am: 4079677883

Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
2018-06-13 15:33:56 -07:00
Pengquan Meng
4079677883 Merge "Remove internal ApnSetting." 2018-06-13 20:47:13 +00:00
yuemingw
b98d538bbe Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.

Bug: 77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
2018-06-13 13:33:59 +01:00
Xin Li
44de687b93 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: Ibb6c6e3f775ee19127711fcc10b2e00a2289a026
2018-06-08 11:08:02 -07:00
Fan Zhang
1fe94d4fd7 Fix context leak in AudioSwitchPreferenceController.
am: ee96c3a259

Change-Id: I3575074241ee60d573563edbffa214f0d705bea3
2018-06-07 18:14:01 -07:00
Fan Zhang
ee96c3a259 Fix context leak in AudioSwitchPreferenceController.
In this controller the context is stored into a global singleton but was
not cleared, thus leaking context and associated views.

Change-Id: I4247f8ff753bc0a331c6c81a0e4b5b4bc41588de
Fixes: 80507279
Test: robotests
Test: inspected hprof before/after change
2018-06-07 18:53:59 +00:00
Joe Onorato
d4fba82998 Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
am: 32d9f451f9

Change-Id: Ib66379c8c5a5dbae415aecc701ebb0a66859b7d5
2018-06-07 10:07:51 -07:00
TreeHugger Robot
32d9f451f9 Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev 2018-06-07 16:48:51 +00:00
Nathan Harold
1701aaf186 [RadioInfo] Save PreferredNetworkMode to Settings
am: daea8be9ab

Change-Id: I801ae6b29a4cfe1286c4f032662191154dc911fb
2018-06-06 19:19:44 -07:00
Beverly
1717b8550e Merge "If zen settings are updated, don't show onboarding" into pi-dev
am: aaac61eb5e

Change-Id: I96929a31ab8f644f83db74ce12b201bd0852c782
2018-06-06 18:34:25 -07:00
Bill Yi
ac7ce09efe [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a1be4c0829  -s ours

Change-Id: I70453eadb2cf9f4f4130fb68d5ce6f03cc018c3a
2018-06-06 17:30:01 -07:00
Nathan Harold
daea8be9ab [RadioInfo] Save PreferredNetworkMode to Settings
Historically, the debug menu intentionally did not
save the preferred network mode once chosen. This
causes problems because some settings cause a phone
switch which overrides the preferred network mode,
which can cause another phone switch and again
override the preferred network mode, completely
obliterating the requested debug setting. This change
will now save the debug menu setting to the system
settings, which will prevent the circular changes and
loss of setting due to phone switching.

However, caching the debug setting to prevent the phone
switch logic from overriding the setting has a side
effect, which is why it wasn't done historically.
If a debug setting of the preferred network mode
is set, it will cause the UX of the non-debug network
preference screen to change. Thus, someone who uses
the debug menu to make changes must be careful to
re-set the setting to return to the correct UX of the
publicly displayed menu.

Bug: 95133265
Test: -manually set preferred network mode using the
       RadioInfo menu and observed that there is no
       phone switch when setting CDMA.
      -confirmed that changing the network mode in
       RadioInfo will cause UX changes to the public
       network preference menu.

Change-Id: I91f669956a6d02515530855c4617cd0a767d73fa
2018-06-06 17:27:50 -07:00
Evan Rosky
679c8de583 Request Focus in fingerprint rename dialog
am: 7a1d52eb06

Change-Id: I5add9d81a0e6814e5664fc25a3309acda29361b5
2018-06-06 17:24:22 -07:00
Joe Onorato
f4781a79b4 Add comments and additional constants for the known bad anomaly types.
They aren't being used now, but by declaring them now we can consolidate
what we are encouraging OEMs to do in the PI timeframe.

Bug: 78013987
Test: treehugger
Change-Id: I7f86491448e799081b18d71274d2629a902d4972
2018-06-06 16:22:33 -07:00
TreeHugger Robot
aaac61eb5e Merge "If zen settings are updated, don't show onboarding" into pi-dev 2018-06-06 21:40:43 +00:00
TreeHugger Robot
a1be4c0829 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-06-06 21:38:42 +00:00
Beverly
8aef786baa If zen settings are updated, don't show onboarding
Change-Id: I33c328e5d90f1b948c7dacb2e7f6265a1e496d35
Fixes: 109668117
Test: ZenOnboardingActivity
(cherry picked from commit da412f07e5)
2018-06-06 20:29:43 +00:00
Bill Yi
ff3c83466c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8cc9d67a4676ed8db1d8c48a76478efc715375fb
2018-06-06 13:20:03 -07:00
Evan Rosky
7a1d52eb06 Request Focus in fingerprint rename dialog
Bug: 68841055
Test: Manual. dialog comes up with focused entry
Change-Id: I5bb1b7227c1323595bf7f483e11e87e2c3550093
2018-06-06 12:52:05 -07:00
Doris Ling
6e6ed32a03 Only add entry with unique package name to default browser list.
am: 688d1d81cb

Change-Id: I36e4ececdbe333a25f2f7cba6e4a3e4e2f229b71
2018-06-05 19:42:15 -07:00
Doris Ling
688d1d81cb Only add entry with unique package name to default browser list.
When we query the package manager for activities that can handle the
web data uri, different capable activities within the same package will
be returned as separate entries. However, when we show the default
browser apps to the user, the entries are simply base on package name.
So, if there are multiple activities within the same package that can
handle the web data, they will be shown as duplicate entries.

When we process the resolved activities, check the corresponding package
name for duplicate entries before adding it to the default browser list.

Change-Id: I4e1f1e1ea22781efe24d791b367246423ca7a3c4
Merged-In: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes: 84207432
Test: make RunSettingsRoboTests
2018-06-05 17:48:30 -07:00
Atanas Kirilov
5a996aa7fe [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours
am: bed0aff4a2  -s ours

Change-Id: I67fcc4599901d226a6170c0c9c08ac3c0ff655bb
2018-06-04 18:17:44 -07:00
Atanas Kirilov
8006c6a726 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53
am: 128334d2c6

Change-Id: If905b3299ca2e05602e2f82d3e85f20ebdddf48f
2018-06-04 17:47:54 -07:00
Atanas Kirilov
f97fc8eb17 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6
am: 25bd78d7e9

Change-Id: I05dc984a6c0cd5f69d4dc47e33385fa77469ae17
2018-06-04 17:46:21 -07:00
Atanas Kirilov
dabefd5d43 Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d
am: a6b728c5a3

Change-Id: Ibfc308478a04405fb108299da7e2aaab6857c9d3
2018-06-04 17:41:57 -07:00
Atanas Kirilov
bed0aff4a2 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours
am: 71046c3d10  -s ours

Change-Id: If9297fdc320c747d213dc81b4639e7c9f76cdedf
2018-06-04 17:41:55 -07:00
Atanas Kirilov
c114a65956 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832
am: 5dfb976b21

Change-Id: I151b3bdedebdfdef0f6358b4a0315150521b85bf
2018-06-04 17:31:09 -07:00
Atanas Kirilov
224968eebd Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c
am: f2a135ec5a

Change-Id: Ifd13e7ffb4e632538aef51102b7f151777b7b626
2018-06-04 17:18:51 -07:00
Atanas Kirilov
71046c3d10 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours
am: b072779789  -s ours

Change-Id: I517819e05e5283e6c50555c713d79b34179a4f7c
2018-06-04 17:10:35 -07:00
Atanas Kirilov
b072779789 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
am: 8994d1f0a4  -s ours

Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81
2018-06-04 16:59:14 -07:00
Atanas Kirilov
128334d2c6 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3
am: 5e66879b53

Change-Id: Ib02ca4cd840e86f0287c5b02f45419b894f044ea
2018-06-04 16:46:48 -07:00