Jorim Jaggi
a351cda36e
am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev
...
* commit 'a2138a34852be7bcb793940269592ec5669cc3b4':
Add setting to disable assist data (2/2).
Try not to crash while AppInfo is finishing
Banish the memory page to Apps > Advanced
Fix crash when removing fingerprint
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-19 04:51:08 +00:00
Jorim Jaggi
a2138a3485
Merge "Add setting to disable assist data (2/2)." into mnc-dev
2015-05-19 04:40:10 +00:00
Jorim Jaggi
bc38a9a0ab
Add setting to disable assist data (2/2).
...
Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
2015-05-18 21:38:45 -07:00
Matthew Williams
7d20fc8bf8
am aa64ba55: am 9d2edaf2: am 6ee5a4d0: Update Backup/reset UI
...
* commit 'aa64ba5550a7d886db6772a180b563be5e706da1':
Update Backup/reset UI
2015-05-19 01:54:47 +00:00
Matthew Williams
aa64ba5550
am 9d2edaf2: am 6ee5a4d0: Update Backup/reset UI
...
* commit '9d2edaf2bcd9e2a52e9092e40619d171847e84ee':
Update Backup/reset UI
2015-05-19 01:41:38 +00:00
Matthew Williams
9d2edaf2bc
am 6ee5a4d0: Update Backup/reset UI
...
* commit '6ee5a4d0ef0386d56c72a8ae81e65443fe5a2979':
Update Backup/reset UI
2015-05-19 01:31:47 +00:00
Tom O'Neill
2b92c7ed25
am 45268e0b: am cc753b6a: am 16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev
...
* commit '45268e0b508080220959232969160f5dc49d2988':
LocationSettings javadoc describes what's in the UI
2015-05-19 01:18:22 +00:00
Matthew Williams
6ee5a4d0ef
Update Backup/reset UI
...
BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
2015-05-18 18:16:09 -07:00
Tom O'Neill
45268e0b50
am cc753b6a: am 16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev
...
* commit 'cc753b6a02270ae8b99420977f32221394af370e':
LocationSettings javadoc describes what's in the UI
2015-05-19 01:06:10 +00:00
Tom O'Neill
cc753b6a02
am 16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev
...
* commit '16a45bafa78f3a2cf2b37879c57441c608b03ab7':
LocationSettings javadoc describes what's in the UI
2015-05-19 00:55:39 +00:00
Tom O'Neill
16a45bafa7
Merge "LocationSettings javadoc describes what's in the UI" into mnc-dev
2015-05-19 00:44:36 +00:00
xinhe
a017e012f3
am 01451c89: am 43e25738: am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '01451c89e17878bdfefaadcfa5f0472587ad5474':
Rename config AP Band for Select AP Band
2015-05-18 22:00:28 +00:00
Robin Lee
01b35bcae3
VPN: UI for forgetting disconnected VPNs
...
Made possible by expanded internal VPN APIs.
Bug: 20872408
Bug: 20692490
Bug: 20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
2015-05-18 22:55:15 +01:00
xinhe
01451c89e1
am 43e25738: am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '43e257381cb0be46708c5c19922e5d03e9bbb131':
Rename config AP Band for Select AP Band
2015-05-18 21:46:54 +00:00
Sanket Padawe
de949e1dc4
am 35470891: am 2a7a5b8e: am 7186a47e: Check for special char when renaming device for Wi-Fi direct.
...
* commit '354708916bdcb9d23608661829afbba6211876e8':
Check for special char when renaming device for Wi-Fi direct.
2015-05-18 21:34:11 +00:00
xinhe
43e257381c
am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band
2015-05-18 21:33:49 +00:00
Jason Monk
07b2d119ec
Try not to crash while AppInfo is finishing
...
Bug: 21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488
2015-05-18 14:24:01 -07:00
xinhe
512bb7e2e3
Merge "Rename config AP Band for Select AP Band" into mnc-dev
2015-05-18 21:22:09 +00:00
Sanket Padawe
354708916b
am 2a7a5b8e: am 7186a47e: Check for special char when renaming device for Wi-Fi direct.
...
* commit '2a7a5b8e683e4438cdced7c456d05e9d501fa583':
Check for special char when renaming device for Wi-Fi direct.
2015-05-18 21:21:49 +00:00
xinhe
baf4dab3a8
Rename config AP Band for Select AP Band
...
Bug:19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8
2015-05-18 14:19:58 -07:00
Tom O'Neill
67dc554030
LocationSettings javadoc describes what's in the UI
...
- In particular, tells OEMs how to add their own settings
Change-Id: I45e4fb7ff59705a2bcb53a72c71fd230f2e085c5
2015-05-18 14:13:29 -07:00
Sanket Padawe
2a7a5b8e68
am 7186a47e: Check for special char when renaming device for Wi-Fi direct.
...
* commit '7186a47ef348c17a985eb51ef74469a32c3c938d':
Check for special char when renaming device for Wi-Fi direct.
2015-05-18 21:10:23 +00:00
Xiyuan Xia
f2c2c19339
No input instead of disabling password/pin entry
...
So that the keyboard does not come and go all the time.
Bug:21271425
Change-Id: If73109fca1417c43307dc6069307789031ffc607
2015-05-18 13:10:28 -07:00
Sanket Padawe
7186a47ef3
Check for special char when renaming device for Wi-Fi direct.
...
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
2015-05-18 11:39:01 -07:00
Robin Lee
9aaee290ad
Badge managed WiFi networks
...
Bug: 19504806
Change-Id: I600b41e4bf6d336b7e091968560c6393041fc6b2
2015-05-18 18:42:36 +01:00
Jason Monk
1178b3457c
am b50875d9: am 6dbb9ff0: am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev
...
* commit 'b50875d9156c7542e93c28e4aa8995fc4c5ed52a':
Try not to crash while AppInfo is finishing
2015-05-18 13:59:06 +00:00
Jason Monk
b50875d915
am 6dbb9ff0: am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev
...
* commit '6dbb9ff05969e708c25ef1af9ba45e23c6a51afe':
Try not to crash while AppInfo is finishing
2015-05-18 13:47:17 +00:00
Jason Monk
6dbb9ff059
am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev
...
* commit 'bbf031ab09b445964acb5e7356ba407dd3dc2d33':
Try not to crash while AppInfo is finishing
2015-05-18 13:34:56 +00:00
Jason Monk
bbf031ab09
Merge "Try not to crash while AppInfo is finishing" into mnc-dev
2015-05-18 13:28:03 +00:00
The Android Automerger
cb8d490b90
merge in mnc-release history after reset to mnc-dev
2015-05-18 01:02:32 -07:00
Svet Ganov
7607ab8262
am 9027bc2f: am 9a3ad8a3: am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '9027bc2f2dbdf1763238843cc7098eafb04c56d0':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:49:09 +00:00
Svet Ganov
9027bc2f2d
am 9a3ad8a3: am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '9a3ad8a36bd7eb7453f532746aa92189404df01a':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:40:15 +00:00
Svet Ganov
9a3ad8a36b
am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '67e067fff4e4ef1eb54f9c238dbf07312434a07e':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:23:50 +00:00
Svet Ganov
67e067fff4
Hide platform platform legacy permissions behind a menu option - settings.
...
bug:21195624
Change-Id: Ib1dcfe2a15685c36e2a59e0921ea74d46ec9738c
2015-05-16 22:59:41 -07:00
The Android Automerger
bd78ad5949
merge in mnc-release history after reset to mnc-dev
2015-05-16 01:03:47 -07:00
Jeff Sharkey
8a4b6714af
am 47b3d7c6: am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
...
* commit '47b3d7c6f58cedadf8cd9c96ddd0ea83059c9225':
Initial pass at storage benchmarks.
2015-05-15 22:33:00 +00:00
Jeff Sharkey
47b3d7c6f5
am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
...
* commit '1661f00ae06aa773a0c308a558fd44bc7b1db877':
Initial pass at storage benchmarks.
2015-05-15 22:22:22 +00:00
Jason Monk
874c97a35c
Banish the memory page to Apps > Advanced
...
Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
2015-05-15 15:13:29 -07:00
Jeff Sharkey
1661f00ae0
am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
...
* commit '11b29e7613a30610981d56786fd5d2e0b7494aab':
Initial pass at storage benchmarks.
2015-05-15 22:08:47 +00:00
Jeff Sharkey
11b29e7613
Merge "Initial pass at storage benchmarks." into mnc-dev
2015-05-15 21:56:01 +00:00
Zoltan Szatmary-Ban
3db1003f09
am a5ddfd4b: am eba12083: am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
...
* commit 'a5ddfd4b6d818a611a942cdeb0dcd0fb1c169f2e':
Reflect Wifi config lockdown restriction in Settings
2015-05-15 20:55:33 +00:00
Zoltan Szatmary-Ban
a5ddfd4b6d
am eba12083: am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
...
* commit 'eba12083bf3cced3d0f9c75efcc96fd130314a5f':
Reflect Wifi config lockdown restriction in Settings
2015-05-15 20:43:56 +00:00
Zoltan Szatmary-Ban
eba12083bf
am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
...
* commit 'cb5444ad2ccf2f16bddafb8844cde6a1a92adddb':
Reflect Wifi config lockdown restriction in Settings
2015-05-15 20:31:58 +00:00
Zoltan Szatmary-Ban
cb5444ad2c
Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
2015-05-15 20:22:34 +00:00
Jason Monk
65ecadc625
Try not to crash while AppInfo is finishing
...
Bug: 21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488
2015-05-15 13:07:45 -04:00
Jason Monk
ec90a59413
am 70842a4e: am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced
...
* commit '70842a4e3b5160df0dd496e909e19516ec09e406':
Banish the memory page to Apps > Advanced
2015-05-15 16:57:13 +00:00
Jason Monk
70842a4e3b
am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced
...
* commit '1f7861b608e49c3336ffe14a074063559e0e0aa7':
Banish the memory page to Apps > Advanced
2015-05-15 16:37:56 +00:00
Jason Monk
1f7861b608
am 0c0e35ef: Banish the memory page to Apps > Advanced
...
* commit '0c0e35ef3008e3b2c8c67d7454cbe46d3d848625':
Banish the memory page to Apps > Advanced
2015-05-15 16:26:33 +00:00
Jason Monk
0c0e35ef30
Banish the memory page to Apps > Advanced
...
Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
2015-05-15 11:37:42 -04:00
Jeff Sharkey
58003515ca
Initial pass at storage benchmarks.
...
After adopting a disk, run benchmarks to compare its performance
against internal storage.
Bug: 21172095
Change-Id: I7c9a5a89e37f7156677fc76bd1ba193eead6665e
2015-05-14 21:08:50 -07:00
