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
Rubin Xu
af43d4ddb4
Remove unused MediaFormat activity
...
As part of cleanup of ExternalStorageFormatter.
Bug: 9433509
Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
2015-07-09 21:29:11 +01:00
Julia Reynolds
8abecf1bb9
am e124fabb: am e10b32ba: am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit 'e124fabbf3a17791d59e76723d7a466a1a7bd756':
Talkback improvements for Settings screens.
2015-07-09 20:10:05 +00:00
Jason Monk
23af96e043
am af55d6f6: am 92b4f9a3: am 0f24766c: am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
...
* commit 'af55d6f6b3a7481a1942b4d1397f4cccf96849bf':
Don't clear data summary when loader is cancelled
2015-07-09 20:10:04 +00:00
Jason Monk
b27e1f4845
am 4faa6321: am eb96e6ab: am f2a3b6a0: am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev
...
* commit '4faa6321f63661e0aab81f6536fe63c0c12ca5d5':
Fix rotation issues
2015-07-09 20:10:02 +00:00
Julia Reynolds
e124fabbf3
am e10b32ba: am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit 'e10b32ba414419c80d86d4105ddbfc14006290a9':
Talkback improvements for Settings screens.
2015-07-09 19:53:46 +00:00
Jason Monk
af55d6f6b3
am 92b4f9a3: am 0f24766c: am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
...
* commit '92b4f9a3d4d60c2085a7dcbef8c73051efa5ca78':
Don't clear data summary when loader is cancelled
2015-07-09 19:53:44 +00:00
Jason Monk
4faa6321f6
am eb96e6ab: am f2a3b6a0: am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev
...
* commit 'eb96e6ab434c7f94d47404c9f0521d86e40c25e3':
Fix rotation issues
2015-07-09 19:53:43 +00:00
Julia Reynolds
e10b32ba41
am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit '1bde32596441375f41b9653eb22b22b3df915ebe':
Talkback improvements for Settings screens.
2015-07-09 19:40:31 +00:00
Jason Monk
92b4f9a3d4
am 0f24766c: am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
...
* commit '0f24766c9a23c4e3011206ae7e946faa1224e655':
Don't clear data summary when loader is cancelled
2015-07-09 19:40:29 +00:00
Jason Monk
eb96e6ab43
am f2a3b6a0: am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev
...
* commit 'f2a3b6a05d97264ac607a7cc898a4797c7fea031':
Fix rotation issues
2015-07-09 19:40:28 +00:00
Julia Reynolds
1bde325964
am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit 'df778e8e76ca41c517385b8c30a468eecc37d107':
Talkback improvements for Settings screens.
2015-07-09 19:25:24 +00:00
Jason Monk
0f24766c9a
am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
...
* commit 'cfd4b754886534418d378d4065200c14844f2b09':
Don't clear data summary when loader is cancelled
2015-07-09 19:25:22 +00:00
Jason Monk
f2a3b6a05d
am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev
...
* commit 'e60ad922de334286cfd36c7f3939d34096e69049':
Fix rotation issues
2015-07-09 19:25:19 +00:00
Zoltan Szatmary-Ban
d8dabc9579
am 26aef1d4: am 97c58230: am 64f55c4f: am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
...
* commit '26aef1d4768e476b20f79bddad6f67ca91cad584':
Check signature match between Cert installer and Settings
2015-07-09 19:18:23 +00:00
Julia Reynolds
df778e8e76
am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
Talkback improvements for Settings screens.
2015-07-09 19:09:25 +00:00
Jason Monk
cfd4b75488
am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
...
* commit '5c3b7c3adefe27bf0a91eba8318048b677d276eb':
Don't clear data summary when loader is cancelled
2015-07-09 19:09:23 +00:00
Jason Monk
e60ad922de
am b6b85325: Merge "Fix rotation issues" into mnc-dev
...
* commit 'b6b85325e91a3e22dd23d67241adecc359dc0952':
Fix rotation issues
2015-07-09 19:09:21 +00:00
Zoltan Szatmary-Ban
26aef1d476
am 97c58230: am 64f55c4f: am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
...
* commit '97c582300cffb2d8271b09ebc310ffc8741c4267':
Check signature match between Cert installer and Settings
2015-07-09 19:08:52 +00:00
Julia Reynolds
963e3fdd05
Merge "Talkback improvements for Settings screens." into mnc-dev
2015-07-09 18:57:24 +00:00
Jason Monk
5c3b7c3ade
Merge "Don't clear data summary when loader is cancelled" into mnc-dev
2015-07-09 18:55:09 +00:00
Jason Monk
b6b85325e9
Merge "Fix rotation issues" into mnc-dev
2015-07-09 18:55:03 +00:00
Zoltan Szatmary-Ban
97c582300c
am 64f55c4f: am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
...
* commit '64f55c4ffb8006bf982a9ca2617cfca1a140e9d9':
Check signature match between Cert installer and Settings
2015-07-09 18:50:22 +00:00
Zoltan Szatmary-Ban
64f55c4ffb
am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
...
* commit '381adf9ea9b10e96cd0a13bee98fc26ba4566a4d':
Check signature match between Cert installer and Settings
2015-07-09 18:00:03 +00:00
Zoltan Szatmary-Ban
381adf9ea9
am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
...
* commit 'ee77eced69fac3e6f94cbb3ce2013d8334c17c90':
Check signature match between Cert installer and Settings
2015-07-09 17:49:56 +00:00
Zoltan Szatmary-Ban
ee77eced69
Merge "Check signature match between Cert installer and Settings" into mnc-dev
2015-07-09 17:33:23 +00:00
Julia Reynolds
ce25af4838
Talkback improvements for Settings screens.
...
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
2015-07-09 13:21:20 -04:00
Zoltan Szatmary-Ban
307e3d048d
Check signature match between Cert installer and Settings
...
To prevent an app masquerading as com.android.certinstaller install
malicious certs.
Bug: 22095968
Change-Id: Ia79f326af0f39a23b687cb08981920665669e0a1
2015-07-09 18:16:27 +01:00
