Wink Saville
e09e245173
am c1ded7e2: am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit 'c1ded7e23fc385f902720ca4590031bd690ecee3':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:12:18 +00:00
Lajos Molnar
0a03478cea
am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
...
* commit '8b2c19b5780bc2dedb51982b2a40c573e1c86157':
Reword NuPlayer developer settings to say AwesomePlayer
2014-11-24 18:12:16 +00:00
Andres Morales
ee47e0219e
am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
...
* commit '877e9de67b69c77bd34452c28b1b0a4739da1d90':
Update enable oem unlock warning
2014-11-24 18:12:15 +00:00
Wink Saville
c1ded7e23f
am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit 'fd0c6eb52326ae18d9b82c71b57c0cdef88344fd':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:05:59 +00:00
Lajos Molnar
8b2c19b578
am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
...
* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
Reword NuPlayer developer settings to say AwesomePlayer
2014-11-24 18:05:54 +00:00
Andres Morales
877e9de67b
am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
...
* commit 'e6d4aba3e1686084833a09d1fcdabf91fc35b0b6':
Update enable oem unlock warning
2014-11-24 18:05:33 +00:00
Adrian Roos
90d6c568cf
Don't show RedactionInterstitial when changing password
...
Only show when going from an insecure to secure lock.
Bug: 18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7
2014-11-24 17:33:56 +01:00
Narayan Kamath
d57c79bcc3
am 0d9fece9: am eb7795ed: Merge "Use shortFormat instead of shortFormat4."
...
* commit '0d9fece9e82f92e45c118c4b89d02517c05221d8':
Use shortFormat instead of shortFormat4.
2014-11-24 16:11:43 +00:00
Narayan Kamath
0d9fece9e8
am eb7795ed: Merge "Use shortFormat instead of shortFormat4."
...
* commit 'eb7795ed31ee84c5569490b0949ea271865de7d8':
Use shortFormat instead of shortFormat4.
2014-11-24 16:07:21 +00:00
Paul Crowley
95a28c3f10
Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
2014-11-24 15:21:56 +00:00
Selim Cinek
44b50ad313
Merge "Fixed build breakage due to api change." into lmp-mr1-dev
2014-11-24 13:35:53 +00:00
Selim Cinek
334bd70fc7
Fixed build breakage due to api change.
...
Bug: 16239208
Change-Id: I9c2b13d3687f9f61307e0c13b6940425faebfa9f
2014-11-24 14:11:49 +01:00
Zoltan Szatmary-Ban
6ad8579262
Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev
2014-11-24 12:08:02 +00:00
PauloftheWest
ac5c081adc
Changed SIM lock toggle to a switch
...
Bug: 18408617
Change-Id: Iea14f40082aa9b7fd6c1925ee5ca5e6bc6841140
2014-11-23 17:19:49 -08:00
Wink Saville
239d185aa7
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
2014-11-22 20:19:56 +00:00
Wink Saville
0183fb5394
Additional changes to SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:11:39 -08:00
Lajos Molnar
c3245a0555
Reword NuPlayer developer settings to say AwesomePlayer
...
Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c
2014-11-21 21:51:29 -08:00
Andres Morales
7090c92f39
Merge "Update enable oem unlock warning" into lmp-mr1-dev
2014-11-22 03:28:45 +00:00
Andres Morales
26b46882cb
Update enable oem unlock warning
...
updating the strings from bug previously fixed
Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6
2014-11-21 16:42:57 -08:00
Sanket Padawe
4af95de3c1
am ed98052c: am db494098: am 9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev
...
* commit 'ed98052cf2a104b650a00d13ac0ee2334fbc8af3':
Changing sim selection dialog in Settings to use phoneAccount
2014-11-22 00:00:31 +00:00
Sanket Padawe
9209ce852a
Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev
2014-11-21 23:34:31 +00:00
Zoltan Szatmary-Ban
9986ca49d6
am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
...
* commit '3da30aabf18dcb0107894d7ef400f417cc665f5d':
Remove backup preferences if backup service is inactive
2014-11-21 15:37:25 +00:00
Zoltan Szatmary-Ban
5875aefa8a
Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
2014-11-21 15:21:34 +00:00
Paul Crowley
13b8b564f8
Reduce number of attempts before factory reset to 30.
...
Bug: 18292029
Change-Id: I2a78775d0505a3064838443ea631fee0ad612e5c
2014-11-21 09:44:09 +00:00
Amith Yamasani
75054383e2
am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
...
automerge: 0775058
2014-11-21 03:27:36 +00:00
Wink Saville
6eeede1f04
am 14d486de: am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 514b6e8
...
* commit '14d486de9553e2adddd937616a7895d4301f2417':
Revert "Additional changes to SubscriptionManager API as per API council."
2014-11-21 02:57:10 +00:00
Wink Saville
1e8a3be5ad
am 75730eac: am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: b8b8bb2
...
* commit '75730eacb893f141c0da2bed0eeb06c71b3ffa04':
Additional changes to SubscriptionManager API as per API council.
2014-11-21 02:57:08 +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
Zoltan Szatmary-Ban
2a7a9f6b9e
am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985
...
* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
Show managed profile accounts on Settings > Factory Reset
2014-11-20 21:29:12 +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
fd06f01481
am 158717ed: am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev automerge: 4a0d6f3
...
* commit '158717edaaa7b74787cd3e1ae6bf1f23e7dc854f':
Added a check if a custom activity can be started
2014-11-20 21:13:25 +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
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
Zoltan Szatmary-Ban
876a21bae8
Remove backup preferences if backup service is inactive
...
Also show informative message instead.
Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
2014-11-20 20:20:49 +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
Simranjit Singh Kohli
7df0b799a8
[New RemoveAccount API in Settings App]:
...
Modify Settings app to use the new account remove API
Bug: 18292092
Change-Id: I5f02d71bc0c7ca3e38157d38dea077c6fe6eb34e
2014-11-19 17:01:32 -08: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
Sanket Padawe
79e44da1ba
Changing sim selection dialog in Settings to use phoneAccount
...
Changing sim selection dialog in Settings UI to select Call to display icons using
phoneAccount.
Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb
2014-11-19 18:45:27 +00: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
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
af49caf6b7
am fbf9642b: am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev
...
* commit 'fbf9642bee2e0aaa24770c282e21be674cb4b5b5':
Fix NPE caused by status update outside activity lifecycle
2014-11-18 20:20:27 +00:00
Sanket Padawe
d1cb0d3805
am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
...
* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
Adding icons to sim color selection in settings UI.
2014-11-18 20:17:51 +00:00
PauloftheWest
ed6cf9c191
am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev
...
* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
Created Multi-SIM notifications.
2014-11-18 20:17:50 +00:00
Zoltan Szatmary-Ban
cfe521e6e3
Stop background processes if TrustedCredentialSettings fragment gets detached
...
Otherwise getActivity() returns null and other nasty null pointer dereferencings happen.
Bug: 17976307
Change-Id: If867785f991217267e0bf0ad3058a62177509852
2014-11-18 18:02:48 +00:00
Narayan Kamath
ad53f0b936
Use shortFormat instead of shortFormat4.
...
Won't make a difference since shortFormat4 is simply shortFormat
with the 'y' characters doubled.
bug: 18388178
Change-Id: I6177807430b295035092367553da5de3b942e2d6
2014-11-18 15:17:44 +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
d85aa17894
Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
2014-11-17 23:53:13 +00:00
PauloftheWest
79381a928b
Merge "Created Multi-SIM notifications." into lmp-mr1-dev
2014-11-17 22:50:08 +00:00
Sanket Padawe
a8bd025d35
Adding icons to sim color selection in settings UI.
...
Adding icons to sim color selection of sim settings UI.
Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
2014-11-17 10:43:37 -08:00
