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
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
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
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
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
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
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
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
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
Matthew Williams
a790557431
am fe5d0d9b: am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation
...
* commit 'fe5d0d9b67ff33f88a924c7231b564bc7d7e7be6':
Add strings for fullbackup data erase confirmation
2015-05-15 02:39:24 +00:00
Matthew Williams
fe5d0d9b67
am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation
...
* commit '8c5d388922812ee1063ab0603f68f8c2e1faecd5':
Add strings for fullbackup data erase confirmation
2015-05-15 02:28:36 +00:00
Matthew Williams
8c5d388922
am 5af3d6f5: Add strings for fullbackup data erase confirmation
...
* commit '5af3d6f5cb95d654b963eae94155285e4e23a97e':
Add strings for fullbackup data erase confirmation
2015-05-15 02:17:52 +00:00
Matthew Williams
5af3d6f5cb
Add strings for fullbackup data erase confirmation
...
Added a new string called fullbackup_erase_dialog_message which
will be displayed when the user has seen the "opted into dolly"
text.
Old string remains in place for the case where the user
hasn't seen the text.
BUG: 20489775
Change-Id: Id6675d1510cf1598f84fdfdcda7f6502a6cf6715
2015-05-14 18:57:32 -07:00
Svet Ganov
2c44100fdc
am 588faa33: am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev
...
* commit '588faa3353965c6fa1670122b58060783b347d5a':
Fix a typo.
2015-05-15 00:07:27 +00:00
Svet Ganov
588faa3353
am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev
...
* commit 'def90c568c5787a83052554bc8c0ed7e00896fee':
Fix a typo.
2015-05-14 23:54:50 +00:00
Svet Ganov
def90c568c
am 3bd7db9f: Merge "Fix a typo." into mnc-dev
...
* commit '3bd7db9f85a27f98f59b254764a41914905020d7':
Fix a typo.
2015-05-14 23:45:35 +00:00
Svet Ganov
3bd7db9f85
Merge "Fix a typo." into mnc-dev
2015-05-14 23:29:27 +00:00
Svet Ganov
280e59f1fb
Fix a typo.
...
Change-Id: I38855b1f83d2524ff76b78a3109f18e128d803e1
2015-05-14 16:27:51 -07:00
Jorim Jaggi
bf373fddda
am e1fa322d: am 7dc5d2c0: am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
...
* commit 'e1fa322dec6a179abb48192135cf3ae3c00c1ee6':
Fix crash when removing fingerprint
2015-05-14 22:40:36 +00:00
Jorim Jaggi
e1fa322dec
am 7dc5d2c0: am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
...
* commit '7dc5d2c044e07730784a5897e74ea6e696a43bbc':
Fix crash when removing fingerprint
2015-05-14 22:28:27 +00:00
Jorim Jaggi
7dc5d2c044
am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
...
* commit '68d208e9034a1e547d752a76f67a72680e380d07':
Fix crash when removing fingerprint
2015-05-14 22:20:33 +00:00
Fabrice Di Meglio
df83765307
am 41f6869a: am a9af1d26: am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
...
* commit '41f6869a8c36357db181cfb0843aaa518a74c1a8':
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 22:15:52 +00:00
Jorim Jaggi
68d208e903
Merge "Fix crash when removing fingerprint" into mnc-dev
2015-05-14 22:12:38 +00:00
Fabrice Di Meglio
41f6869a8c
am a9af1d26: am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
...
* commit 'a9af1d262cbf5c26a57b4028d57b4053c29fdce6':
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 22:01:52 +00:00
Fabrice Di Meglio
a9af1d262c
am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
...
* commit '3fc7bfd9d9a4aa5b89b714ef18385366fde2b946':
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 21:51:07 +00:00
Fabrice Di Meglio
3fc7bfd9d9
Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
2015-05-14 21:40:53 +00:00
Fabrice Di Meglio
ae35e0c013
Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
...
- prevent the NPE
Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
2015-05-14 14:31:41 -07:00
Amith Yamasani
ccf1bc452f
am 1e37bb87: am 7ca7645c: am fd210786: Fix build
...
* commit '1e37bb877c180dbc990b43a18e41b27a6970eb39':
Fix build
2015-05-14 06:53:58 +00:00
