Commit Graph

16501 Commits

Author SHA1 Message Date
Russell Brenner
97759fa8d1 [DO NOT MERGE] Preserve FRP lock if wiped during SUW
am: 14bf226c79

* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00
Russell Brenner
14bf226c79 [DO NOT MERGE] Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
2015-10-14 12:45:51 +00:00
Geoff Mendal
26bb544ff2 am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE
2015-10-14 12:40:45 +00:00
Geoff Mendal
46eb1857b6 Import translations. DO NOT MERGE
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
2015-10-14 05:30:54 -07:00
Geoff Mendal
0e3ffe7cce am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
  Import translations. DO NOT MERGE
2015-10-12 13:00:56 +00:00
Geoff Mendal
5fa0a93d3e am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
  Import translations. DO NOT MERGE
2015-10-12 12:55:33 +00:00
Geoff Mendal
4fedc0fdaf Import translations. DO NOT MERGE
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
2015-10-12 05:34:25 -07:00
Geoff Mendal
3963b980be am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '793b2a2d444192ee587a643c88e535ebf0c98158':
  Import translations. DO NOT MERGE
2015-10-07 12:51:18 +00:00
Geoff Mendal
793b2a2d44 am d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit 'd4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
  Import translations. DO NOT MERGE
2015-10-07 12:46:38 +00:00
Geoff Mendal
d4fd061d6e Import translations. DO NOT MERGE
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
2015-10-07 05:36:18 -07:00
Geoff Mendal
45335b0c5e am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '0070fbfe01eab83402949298188322f1168b5b3c':
  Import translations. DO NOT MERGE
2015-10-05 12:45:22 +00:00
Geoff Mendal
0070fbfe01 am f0338376: (-s ours) Import translations. DO NOT MERGE
* commit 'f0338376779311f2ee0c709e9735dfe5e89cde56':
  Import translations. DO NOT MERGE
2015-10-05 12:41:50 +00:00
Geoff Mendal
f033837677 Import translations. DO NOT MERGE
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
2015-10-05 05:33:27 -07:00
Geoff Mendal
c7b0a81625 am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '49b491bb7634284a8622e48c88571aa59ba59ac7':
  Import translations. DO NOT MERGE
2015-09-30 12:47:04 +00:00
Geoff Mendal
49b491bb76 am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '2e095fa263b0887fc55576b32625264e13fee4c7':
  Import translations. DO NOT MERGE
2015-09-30 12:41:16 +00:00
Geoff Mendal
2e095fa263 Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
2015-09-30 05:34:33 -07:00
Baligh Uddin
2b802ceb32 am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit 'cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
  Import translations. DO NOT MERGE
2015-09-27 02:57:14 +00:00
Baligh Uddin
9b9d77f163 am 15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '15243a260c8accf0a1fc999282a10d1ecec334b6':
  Import translations. DO NOT MERGE
2015-09-27 02:50:43 +00:00
Baligh Uddin
cd6e60343a am d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit 'd0d54fc1c54a046eaf919978d584fa3528c36e24':
  Import translations. DO NOT MERGE
2015-09-27 02:49:56 +00:00
Baligh Uddin
d0d54fc1c5 Import translations. DO NOT MERGE
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
2015-09-25 13:23:31 -07:00
Baligh Uddin
15243a260c Import translations. DO NOT MERGE
Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import
2015-09-25 13:05:09 -07:00
Zach Jang
1304f47c1b am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '5cac896612ead73d08acb588e2f62512f8789cf4':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:39 +00:00
Zach Jang
564ec9357b am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:36 +00:00
Zach Jang
5cac896612 am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '8fc9b5b68494ac341b882623b1cbe124fd6256f8':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:23 +00:00
Zach Jang
00721b4afa am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Zach Jang
8fc9b5b684 am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:40:30 +00:00
Zach Jang
2e006b2b07 am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48 am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8 am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:24 +00:00
Zach Jang
c87ceb7ec1 am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:18 +00:00
Zach Jang
6ceb2ba9b8 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -07:00
Zach Jang
e7e0c03f00 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
2015-09-12 00:40:20 +00:00
Sanket Padawe
86d853000f am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '19336da3f729fcde00782ae60124b1219bd4bf2b':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 20:03:32 +00:00
Sanket Padawe
19336da3f7 am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:49:53 +00:00
Sanket Padawe
ac2347c0bf am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:25:06 +00:00
Sanket Padawe
158fa95218 am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 17:08:45 +00:00
Sanket Padawe
df9b13af9b am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:44:58 +00:00
Sanket Padawe
74d8594950 am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:15:17 +00:00
Sanket Padawe
e05f714315 Check for special char when renaming device for Wi-Fi direct.
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef3)
2015-07-28 16:09:59 +00:00
Stuart Scott
6b08e11ef9 am 53eec9fa: Fix sim notifications.
* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
  Fix sim notifications.
2015-03-27 00:34:46 +00:00
Stuart Scott
53eec9faad Fix sim notifications.
bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
2015-03-25 18:07:45 +00:00
Geoff Mendal
ac8641ede6 Import translations. DO NOT MERGE
Change-Id: Ia82339bdeddcb2be2864732de532c5d669d9a286
Auto-generated-cl: translation import
2015-03-18 05:56:44 -07:00
Geoff Mendal
01492de48d Import translations. DO NOT MERGE
Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import
2015-03-16 05:44:27 -07:00
Geoff Mendal
dd07a86251 Import translations. DO NOT MERGE
Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import
2015-03-11 05:40:13 -07:00
Geoff Mendal
0d8c3df4d9 Import translations. DO NOT MERGE
Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import
2015-03-09 05:41:43 -07:00
Geoff Mendal
ba5c9ed183 Import translations. DO NOT MERGE
Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import
2015-03-04 05:41:50 -08:00
Geoff Mendal
130fc5caf8 Import translations. DO NOT MERGE
Change-Id: Iaf3498c2c21da6853e8f80ba582c2d4ac6309331
Auto-generated-cl: translation import
2015-03-02 05:55:15 -08:00
Sanket Padawe
49d660ac01 am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '4e838ca96ec1ebf1df3d75e729facf1fc012b431':
  Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 22:04:34 +00:00
Sanket Padawe
4e838ca96e Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev 2015-02-26 21:57:50 +00:00