Amith Yamasani
07750584c8
am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
...
* commit 'aa96cbec46dc2fce7eabd660ad08c1ef8326dbb3':
Watch out for deleted user when exiting async task
2014-11-21 02:48:18 +00:00
Wink Saville
14d486de95
am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
...
automerge: 514b6e8
2014-11-21 02:41:26 +00:00
Wink Saville
75730eacb8
am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
automerge: b8b8bb2
2014-11-21 02:40:46 +00:00
Amith Yamasani
aa96cbec46
am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
...
* commit '0cc764beed2b816ee7e092591c7f205601e1b596':
Watch out for deleted user when exiting async task
2014-11-21 01:50:50 +00:00
Amith Yamasani
0cc764beed
Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
2014-11-21 01:47:20 +00:00
Jeff Davidson
32b7def42f
am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev
...
* commit '9503a00c587bff45d09206af309abc87b8f138df':
Final strings for Wi-Fi Assistant in platform settings.
2014-11-21 00:44:02 +00:00
Zoltan Szatmary-Ban
ead7991dea
am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev
...
automerge: 72b1985
2014-11-20 21:25:42 +00:00
Paul Crowley
a41edb6c66
am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev
...
automerge: 50c67366
2014-11-20 21:23:50 +00:00
Amith Yamasani
45f86236e4
Watch out for deleted user when exiting async task
...
Fixes a problem where the async task can take a while to execute
and in the meantime the user can be removed. On exiting the async
task and updating the UI, make sure the user hasn't been deleted.
Bug: 18411181
Change-Id: I1831f3e53084c49e27557cb7aacec78c753a611b
2014-11-20 13:19:18 -08:00
Fyodor Kupolov
158717edaa
am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev
...
automerge: 4a0d6f3
2014-11-20 21:06:20 +00:00
Wink Saville
514b6e8bb8
am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
...
* commit 'b9b69faf5ff4ba1a944b180b7240ad1f95e9acea':
Revert "Additional changes to SubscriptionManager API as per API council."
2014-11-20 20:34:30 +00:00
Wink Saville
b9b69faf5f
Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
2014-11-20 20:30:48 +00:00
Wink Saville
b8b8bb2fa8
am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit 'db2e05d89e0b99b226fce9cc3af8552745f5e4ca':
Additional changes to SubscriptionManager API as per API council.
2014-11-20 20:27:46 +00:00
Wink Saville
9aa0dd69c5
Revert "Additional changes to SubscriptionManager API as per API council."
...
This reverts commit 1285f74fcb
2014-11-20 20:27:34 +00:00
Wink Saville
db2e05d89e
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
2014-11-20 20:21:29 +00:00
Jeff Davidson
9503a00c58
am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev
...
* commit '101743f9ecccae0054ba5867ae0585750a0a8bd2':
Final strings for Wi-Fi Assistant in platform settings.
2014-11-20 18:43:00 +00:00
Jeff Davidson
101743f9ec
Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev
2014-11-20 18:37:53 +00:00
Zoltan Szatmary-Ban
72b198508a
am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev
...
* commit '548460bda5d37b22165b8e9e4e6349699910795a':
Show managed profile accounts on Settings > Factory Reset
2014-11-20 14:10:14 +00:00
Zoltan Szatmary-Ban
548460bda5
Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev
2014-11-20 14:06:14 +00:00
Paul Crowley
50c673660e
am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev
...
* commit '67b4af148db7638ba6fb9ed84efb258f6c7e1c88':
Prevent factory reset for short passwords in CryptKeeper
2014-11-20 10:49:27 +00:00
Paul Crowley
67b4af148d
Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev
...
Conflicts:
src/com/android/settings/CryptKeeper.java
Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da
2014-11-20 10:37:39 +00:00
Fyodor Kupolov
4a0d6f3e11
am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev
...
* commit '5925e1912e576e90d96a61403d658d70ca95bfce':
Added a check if a custom activity can be started
2014-11-19 22:22:57 +00:00
Fyodor Kupolov
5925e1912e
Merge "Added a check if a custom activity can be started" into lmp-mr1-dev
2014-11-19 22:20:25 +00:00
Paul Crowley
1cb45399d3
Prevent factory reset for short passwords in CryptKeeper
...
automerge: 8fca3fc
2014-11-19 20:49:13 +00:00
Jeff Davidson
13b2a28463
Final strings for Wi-Fi Assistant in platform settings.
...
Bug: 13780935
Change-Id: I70a22b3f439d05570d2508f8e05ed3aa9627e8f1
2014-11-19 11:59:11 -08:00
Geoff Mendal
d716d4749c
am 6ed3dc44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '6ed3dc44b6a7abca582f2e05656562c09af369b0':
Import translations. DO NOT MERGE
2014-11-19 19:36:06 +00:00
Geoff Mendal
d15068d15a
am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE
...
* commit '328483aa1bd64ec1275dc543f8e67f868e3f6122':
Import translations. DO NOT MERGE
2014-11-19 19:32:17 +00:00
Geoff Mendal
6ed3dc44b6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-19 19:31:02 +00:00
Geoff Mendal
328483aa1b
am 36d2656f: (-s ours) Import translations. DO NOT MERGE
...
* commit '36d2656f963e29b3290c50664677bd95fe51240b':
Import translations. DO NOT MERGE
2014-11-19 19:27:37 +00:00
Geoff Mendal
3b77e45e5c
Import translations. DO NOT MERGE
...
Change-Id: I6ac6d662765779e610a210ad7ac792e7543af3fc
Auto-generated-cl: translation import
2014-11-19 11:08:37 -08:00
Geoff Mendal
36d2656f96
Import translations. DO NOT MERGE
...
Change-Id: Id90b273276938939b6e68b00149e54e8ec146ca6
Auto-generated-cl: translation import
2014-11-19 11:03:40 -08:00
Wink Saville
1285f74fcb
Additional changes to SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 10:34:28 -08: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
Fyodor Kupolov
07ab95c43e
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
2014-11-18 17:12:54 -08:00
Alexandra Gherghina
fbf9642bee
am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev
...
* commit 'c11a94e98a911756e645216d36dbf0a438a3fb3e':
Fix NPE caused by status update outside activity lifecycle
2014-11-18 10:12:49 +00:00
Alexandra Gherghina
c11a94e98a
am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev
...
* commit '3a84d40133e7a4f74fd1df091ba43fb85859b169':
Fix NPE caused by status update outside activity lifecycle
2014-11-18 10:08:49 +00:00
Alexandra Gherghina
3a84d40133
Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev
2014-11-18 10:02:37 +00:00
Sanket Padawe
1115d93887
am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
...
* commit '1ec6807a11b92ceca43e09d8517641150ccb826a':
Adding icons to sim color selection in settings UI.
2014-11-18 02:08:01 +00:00
PauloftheWest
5f0da57c65
am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev
...
* commit 'a41e40ec3039f77bbe7c02714d7a2abef24c0a6d':
Created Multi-SIM notifications.
2014-11-18 02:06:55 +00:00
Geoff Mendal
450d9c33d0
am ab247fa4: (-s ours) am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ab247fa4a72c81138fab5e34304cfef40bc10a9f':
Import translations. DO NOT MERGE
2014-11-18 02:06:54 +00:00
Geoff Mendal
be2d4f9959
am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'f17620e3d60e63425bdf3d14ce35116f6981c5b6':
Import translations. DO NOT MERGE
2014-11-18 02:06:53 +00:00
Sanket Padawe
1ec6807a11
am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
...
* commit 'd85aa17894db4928d010c1590c2c6ea781546230':
Adding icons to sim color selection in settings UI.
2014-11-17 23:57:18 +00:00
Sanket Padawe
d85aa17894
Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
2014-11-17 23:53:13 +00:00
PauloftheWest
a41e40ec30
am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev
...
* commit '79381a928b998cc45ffeeea624d8bc4b77c6529a':
Created Multi-SIM notifications.
2014-11-17 22:59:24 +00:00
Geoff Mendal
ab247fa4a7
am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE
...
* commit '2321682d5ac67eb3d2d6cfd71ef6f4ddfd3cd9e6':
Import translations. DO NOT MERGE
2014-11-17 22:59:15 +00:00
Geoff Mendal
f17620e3d6
am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '383d2ab6bd9a0e3755a40a3b0b98e939cc017a6c':
Import translations. DO NOT MERGE
2014-11-17 22:59:04 +00:00
Geoff Mendal
56491f296c
am 6c30eb97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '6c30eb976a32d21cd65a0281f24544a609657594':
Import translations. DO NOT MERGE
2014-11-17 22:54:23 +00:00
PauloftheWest
79381a928b
Merge "Created Multi-SIM notifications." into lmp-mr1-dev
2014-11-17 22:50:08 +00:00
Geoff Mendal
2321682d5a
am f0450338: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f04503387498337787e315979dd30bfeedb88b68':
Import translations. DO NOT MERGE
2014-11-17 22:16:23 +00:00
Geoff Mendal
6c30eb976a
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-17 22:13:18 +00:00
