Baligh Uddin
d0d54fc1c5
Import translations. DO NOT MERGE
...
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
2015-09-25 13:23:31 -07: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
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
Fyodor Kupolov
b26bec1a6f
am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
...
* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
2015-01-29 20:39:11 +00:00
Fyodor Kupolov
83930bc3ee
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59
...
automerge: 5b2b7e1
2015-01-29 20:34:29 +00:00
Fyodor Kupolov
5b2b7e1897
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
automerge: 3a3ff59
2015-01-29 19:39:59 +00:00
Fyodor Kupolov
f400051c3a
am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
...
* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
2015-01-29 19:35:11 +00:00
Fyodor Kupolov
9e432a698b
am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8
...
automerge: 0738bae
2015-01-29 19:29:20 +00:00
Fyodor Kupolov
6355e1152a
am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
* commit '77a2e3d62574be9cf0aae17231fd423a7a399984':
Added a check if a custom activity can be started
2015-01-29 19:09:23 +00:00
Fyodor Kupolov
77a2e3d625
am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
Added a check if a custom activity can be started
2015-01-29 19:03:01 +00:00
Fyodor Kupolov
3a3ff59197
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
Added a check if a custom activity can be started
2015-01-29 18:57:22 +00:00
Fyodor Kupolov
a6c8a0e66d
am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
Added a check if a custom activity can be started
2015-01-29 18:50:43 +00:00
Fyodor Kupolov
d8b606b81a
am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
Added a check if a custom activity can be started
2015-01-29 18:45:51 +00:00
Fyodor Kupolov
bd89b7b45e
am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
Added a check if a custom activity can be started
2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0738bae916
am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
automerge: 57641a8
2015-01-29 18:12:42 +00:00
Fyodor Kupolov
2f3bc3cb3f
am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
Added a check if a custom activity can be started
2015-01-29 18:12:04 +00:00
Fyodor Kupolov
0d5ad3b73e
am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
Added a check if a custom activity can be started
2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50
am d7e93570: am f11f9f47: Added a check if a custom activity can be started
...
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
Added a check if a custom activity can be started
2015-01-29 18:02:40 +00:00
Fyodor Kupolov
e3904c4f09
am e8e7b9b3: Added a check if a custom activity can be started
...
* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
Added a check if a custom activity can be started
2015-01-29 18:01:00 +00:00
Fyodor Kupolov
d7e93570d3
am f11f9f47: Added a check if a custom activity can be started
...
* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
Added a check if a custom activity can be started
2015-01-29 17:55:47 +00:00
Fyodor Kupolov
f11f9f47d3
Added a check if a custom activity can be started
...
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.
Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e
2015-01-28 10:31:36 +00:00
Fyodor Kupolov
e8e7b9b381
Added a check if a custom activity can be started
...
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.
Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
2015-01-28 05:23:07 -05:00
Paul Crowley
1cb45399d3
Prevent factory reset for short passwords in CryptKeeper
...
automerge: 8fca3fc
2014-11-19 20:49:13 +00:00
Paul Crowley
8fca3fcc06
Prevent factory reset for short passwords in CryptKeeper
...
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device. If we do, we risk resetting the device
due to stray input.
Bug: 18211475
Bug: 18273380
Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57
Conflicts:
src/com/android/settings/CryptKeeper.java
Conflicts:
src/com/android/settings/CryptKeeper.java
2014-11-19 12:00:32 +00:00
Geoff Mendal
f045033874
Import translations. DO NOT MERGE
...
Change-Id: I8742961e8d64b9b83cb3e3583c4316cd31399621
Auto-generated-cl: translation import
2014-11-17 14:12:53 -08:00
Geoff Mendal
827ad0c38c
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-11-12 23:30:10 +00:00
Geoff Mendal
c9e7209ca8
Import translations. DO NOT MERGE
...
Change-Id: I99007a120d90a442a65f31ab35b8da3d1aa8524e
Auto-generated-cl: translation import
2014-11-12 14:48:49 -08:00
Geoff Mendal
9ae3bf2d3f
Import translations. DO NOT MERGE
...
Change-Id: I8170fefa7733e2feddad643069cc0407631a2b96
Auto-generated-cl: translation import
2014-11-12 12:07:20 -08:00
Geoff Mendal
cafcb70a68
Import translations. DO NOT MERGE
...
Change-Id: I6d7b0e7986c8ea87e557cda85144a3501f86fc29
Auto-generated-cl: translation import
2014-11-10 14:21:23 -08:00
Baligh Uddin
960c98f91d
Import translations. DO NOT MERGE
...
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
2014-11-06 09:49:04 -08:00
Geoff Mendal
f6b609872c
Import translations. DO NOT MERGE
...
Change-Id: Ia602c0a9ac55f054d0c01cc742d085da1fcef19e
Auto-generated-cl: translation import
2014-11-03 10:07:02 -08:00
Geoff Mendal
4c79a9ecc0
Import translations. DO NOT MERGE
...
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
2014-10-29 13:38:11 -07:00
Geoff Mendal
c7df50c5fd
Import translations. DO NOT MERGE
...
Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import
2014-10-27 09:49:35 -07:00
Michael Wright
95f29a1930
Skip Misc/Overcounted battery stats in release builds.
...
automerge: f7a5017
2014-10-24 22:04:21 +00:00
Michael Wright
f7a5017fa6
Skip Misc/Overcounted battery stats in release builds.
...
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
2014-10-24 14:25:49 -07:00
Sanket Padawe
5fd97c551f
Merge "WIP support icon" into lmp-sprout-dev
2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe
WIP support icon
...
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
2014-10-24 10:17:08 -07:00
Baligh Uddin
cc5b08b63c
am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
...
* commit '8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
Import translations. DO NOT MERGE
2014-10-23 21:52:59 +00:00
Baligh Uddin
8d7fdc618a
Import translations. DO NOT MERGE
...
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
2014-10-23 14:37:38 -07:00
Amith Yamasani
526e4b4155
am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
...
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
Disable factory reset for secondary users
2014-10-23 00:02:44 +00:00
