Jason Monk
53dd1d4dee
Merge "Fix app icon size" into mnc-dev
2015-07-13 18:05:54 +00:00
Sanket Padawe
7995ca4165
Use same technology type for LTE/4G
...
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true
Bug: 22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
2015-07-13 10:15:41 -07:00
Chris Wren
2f8bb8ea97
Merge "import new view enums into MetricsLogger" into mnc-dev
2015-07-13 16:21:26 +00:00
Jason Monk
061c8af3d6
Fix app icon size
...
Bug: 22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
2015-07-13 12:18:43 -04:00
Geoff Mendal
b59ef5ad39
am b785dfae: (-s ours) am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b785dfae7e96581d16ccf0427644cb61e0fb81bb':
Import translations. DO NOT MERGE
2015-07-13 15:50:40 +00:00
Geoff Mendal
905c79105b
am 567c3a03: (-s ours) am 5fb58ffc: (-s ours) am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit '567c3a030d796f401981f62d4432b8d5c963e4c8':
Import translations. DO NOT MERGE
2015-07-13 15:50:39 +00:00
Geoff Mendal
b785dfae7e
am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc95aedca49c204a4b6c25cd3e4682d09d2dcaf6':
Import translations. DO NOT MERGE
2015-07-13 15:36:22 +00:00
Geoff Mendal
567c3a030d
am 5fb58ffc: (-s ours) am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit '5fb58ffc5e419d091472697e82cf7e0e7e4de833':
Import translations. DO NOT MERGE
2015-07-13 15:36:21 +00:00
Geoff Mendal
cc95aedca4
am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c2175d78421d1f35a53a37e37bd97150a900bf37':
Import translations. DO NOT MERGE
2015-07-13 15:25:36 +00:00
Geoff Mendal
5fb58ffc5e
am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b30eaa843c0fb31df2b7157c05ad7d01d3e0d35e':
Import translations. DO NOT MERGE
2015-07-13 15:25:35 +00:00
Geoff Mendal
c2175d7842
am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a52bf2017292a6da41d9b6950a1564710a94367e':
Import translations. DO NOT MERGE
2015-07-13 15:11:43 +00:00
Geoff Mendal
b30eaa843c
am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit '7174a3d7011fa4456bebe7e7b55f47aaed013d29':
Import translations. DO NOT MERGE
2015-07-13 15:10:40 +00:00
Geoff Mendal
a52bf20172
Import translations. DO NOT MERGE
...
Change-Id: I75a6759a8ccd3a922121912e0c2bdb291fda3e56
Auto-generated-cl: translation import
2015-07-13 07:08:00 -07:00
Geoff Mendal
536ed18478
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-13 13:54:00 +00:00
Geoff Mendal
a0838470f3
Import translations. DO NOT MERGE
...
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
2015-07-13 06:53:26 -07:00
Zoltan Szatmary-Ban
098c296df2
Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
2015-07-13 13:09:54 +00:00
Geoff Mendal
15069c82b4
Import translations. DO NOT MERGE
...
Change-Id: I44582b10dbf32b9feb774da997c56795303499d4
Auto-generated-cl: translation import
2015-07-13 06:04:46 -07:00
Zoltan Szatmary-Ban
706e7014d8
Do not throw exception when MeasurementDetails.mediaSize is empty
...
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:
mVolume == null || !mVolume.isMountedReadable()
Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
2015-07-13 12:37:31 +01:00
Geoff Mendal
7174a3d701
Import translations. DO NOT MERGE
...
Change-Id: I73a807d112306b787b9975ee0c2560a2431f031b
Auto-generated-cl: translation import
2015-07-11 13:37:38 -05:00
Geoff Mendal
da15ade830
Import translations. DO NOT MERGE
...
Change-Id: Ib1f4051b1001de52b74483fc18eaf909e656de67
Auto-generated-cl: translation import
2015-07-11 06:59:16 -07:00
Geoff Mendal
2eb61989eb
Import translations. DO NOT MERGE
...
Change-Id: I9c48ee964f67f56f9996cb44262a05d0c75cf463
Auto-generated-cl: translation import
2015-07-11 06:11:22 -07:00
Maurice Lam
052297172e
[Fingerprint] Export FingerprintEnrollIntroduction
...
Export FingerprintEnrollIntroduction activity under the permission
USE_FINGERPRINT so that setup wizard can start it.
Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
2015-07-10 21:00:02 -07:00
Chris Wren
ef94267afd
import new view enums into MetricsLogger
...
Bug: 21114836
Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
2015-07-10 17:19:58 -04:00
Robin Lee
4e3635d8db
am 722d5e22: am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit '722d5e221aef34220f0e6be874f62b14b7dea13f':
Match getLegacyVpn calls to changed interface
2015-07-10 20:09:32 +00:00
Robin Lee
722d5e221a
am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit 'be638020e55c29b0b283713fb42c9866960b5755':
Match getLegacyVpn calls to changed interface
2015-07-10 19:55:12 +00:00
Rubin Xu
46175909ed
am 6e2c1c2e: am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '6e2c1c2e68f6ff40c7201550446e29c8411154b7':
Remove unused MediaFormat activity
2015-07-10 19:47:04 +00:00
Jason Monk
9b8bfc56bc
am d5c8980a: am 8b35321f: am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit 'd5c8980a3b270ed9ebad365773417f9338252ef0':
Fix wifi not re-ordering
2015-07-10 19:47:03 +00:00
Robin Lee
be638020e5
am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit '719cbc4acfe01d3aaf0dfb1061c06b69b7db2d29':
Match getLegacyVpn calls to changed interface
2015-07-10 19:41:01 +00:00
Rubin Xu
6e2c1c2e68
am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit 'bd2e045e177c831925653ee43b18196c130e22e3':
Remove unused MediaFormat activity
2015-07-10 19:33:00 +00:00
Jason Monk
d5c8980a3b
am 8b35321f: am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit '8b35321fa288bf6ef61099d0ed0f48956f979807':
Fix wifi not re-ordering
2015-07-10 19:32:58 +00:00
Robin Lee
719cbc4acf
am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit 'd3b6832edb5530b23132e054135c7fe93f5f9384':
Match getLegacyVpn calls to changed interface
2015-07-10 19:26:09 +00:00
Rubin Xu
bd2e045e17
am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit 'a383b02c431de7b68f8f913ecfeca9f0051122fe':
Remove unused MediaFormat activity
2015-07-10 19:26:09 +00:00
Jason Monk
8b35321fa2
am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit '9362385095374cc40cc4549d16e913831e9f14d9':
Fix wifi not re-ordering
2015-07-10 19:18:01 +00:00
Robin Lee
d3b6832edb
am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit '7ba46433aefad363a1d2e75d4a12f2886c6d0315':
Match getLegacyVpn calls to changed interface
2015-07-10 19:16:57 +00:00
Rubin Xu
a383b02c43
am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '8b9a9519c865d73ce10a5847b3b99b3cd339114e':
Remove unused MediaFormat activity
2015-07-10 19:16:48 +00:00
Robin Lee
7ba46433ae
Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
2015-07-10 19:05:41 +00:00
Jason Monk
9362385095
am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit 'c07450ae7449dd995499dd7cfd5c9367914d6b95':
Fix wifi not re-ordering
2015-07-10 19:04:47 +00:00
Rubin Xu
8b9a9519c8
am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
Remove unused MediaFormat activity
2015-07-10 19:03:19 +00:00
Jason Monk
c07450ae74
am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit '7ab3cf944dd8c120555dada4fc490a9fe592f37e':
Fix wifi not re-ordering
2015-07-10 18:48:32 +00:00
Rubin Xu
331b9823d0
Merge "Remove unused MediaFormat activity" into mnc-dev
2015-07-10 18:47:51 +00:00
Jason Monk
7ab3cf944d
Merge "Fix wifi not re-ordering" into mnc-dev
2015-07-10 18:37:19 +00:00
Jason Monk
088537a315
Fix wifi not re-ordering
...
Bug: 22361247
Change-Id: I5c25061735628682741060c8a699c0a977c4351b
2015-07-10 14:08:31 -04:00
Julia Reynolds
9da0c2a618
am f9a7abbe: am 1d595713: am 5a8b507e: am a368f9a9: am ddd887af: Prevent crash when removing an account.
...
* commit 'f9a7abbea67bb7e00f84bda2d7a2f1543e9aac2d':
Prevent crash when removing an account.
2015-07-10 17:42:26 +00:00
Julia Reynolds
f9a7abbea6
am 1d595713: am 5a8b507e: am a368f9a9: am ddd887af: Prevent crash when removing an account.
...
* commit '1d5957134ddf1add6ffd4f3fc947440402290fca':
Prevent crash when removing an account.
2015-07-10 17:28:08 +00:00
Julia Reynolds
1d5957134d
am 5a8b507e: am a368f9a9: am ddd887af: Prevent crash when removing an account.
...
* commit '5a8b507e346b12cb76d3b2f0069da1310f409846':
Prevent crash when removing an account.
2015-07-10 17:14:42 +00:00
Julia Reynolds
5a8b507e34
am a368f9a9: am ddd887af: Prevent crash when removing an account.
...
* commit 'a368f9a97405b6358515186614cd9f450119f937':
Prevent crash when removing an account.
2015-07-10 17:06:34 +00:00
Julia Reynolds
a368f9a974
am ddd887af: Prevent crash when removing an account.
...
* commit 'ddd887afc826b82b37ca8bd43c847479c94c07aa':
Prevent crash when removing an account.
2015-07-10 16:51:37 +00:00
Julia Reynolds
ddd887afc8
Prevent crash when removing an account.
...
Bug: 21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
2015-07-10 10:07:21 -04:00
Martijn Coenen
91dcad4089
Fix up Tap and Pay how it works.
...
Also, don't use HCE service description.
Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
2015-07-10 15:43:25 +02:00
Xiaohui Chen
64f530c2f1
sys user split: refactor user settings
...
BUG:19913735
Change-Id: I11e0c728d45bd74b60db89f352b356e97b755651
2015-07-09 15:31:39 -07:00
