Sanket Padawe
cd5863c388
am ec3f7998
: am eec0c11a
: am 19627ca2
: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit 'ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 23:20:44 +00:00
Sanket Padawe
6d99a14a87
am 25f2cfe9
: am 72cedc7a
: am c4cc07b2
: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
...
* commit '25f2cfe94ecc7d05c3c1a74c2e210fffcfc137e1':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
2014-12-18 23:20:18 +00:00
Sanket Padawe
87be2a6dd5
am 2497b44a
: am cff282f3
: am 080674e6
: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
...
* commit '2497b44ab0dac4d16145f6e0cae5708354506955':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 23:20:16 +00:00
Sanket Padawe
ec3f7998db
am eec0c11a
: am 19627ca2
: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit 'eec0c11ae3386284dd6797076764572efeca52c3':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 18:43:55 +00:00
Sanket Padawe
eec0c11ae3
am 19627ca2
: Getting mcc/mnc from system prop instead of subInfoRecord.
...
* commit '19627ca215fa643a443722f183f3f781d4a2b041':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 18:38:52 +00:00
Sanket Padawe
19627ca215
Getting mcc/mnc from system prop instead of subInfoRecord.
...
Bug: 18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
2014-12-18 10:29:16 -08:00
Sanket Padawe
25f2cfe94e
am 72cedc7a
: am c4cc07b2
: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
...
* commit '72cedc7af53483dea41eb391613b94b6f0a7226e':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
2014-12-18 06:38:28 +00:00
Sanket Padawe
72cedc7af5
am c4cc07b2
: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
...
* commit 'c4cc07b2c7f91cdb3695c499f7dca17b8aa9cb6b':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
2014-12-18 06:33:06 +00:00
Sanket Padawe
c4cc07b2c7
Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
2014-12-18 06:28:09 +00:00
Sanket Padawe
4be06d9c48
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
...
This reverts commit 579b66f28d
.
Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
2014-12-18 06:24:36 +00:00
Sanket Padawe
2497b44ab0
am cff282f3
: am 080674e6
: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
...
* commit 'cff282f3fc81c401a873cdf87ff399b8be28f90b':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 05:04:12 +00:00
Sanket Padawe
cff282f3fc
am 080674e6
: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
...
* commit '080674e6da8e3db392a2a9e96a00cfc8e4635d00':
Getting mcc/mnc from system prop instead of subInfoRecord.
2014-12-18 04:58:46 +00:00
Sanket Padawe
080674e6da
Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
2014-12-18 04:53:34 +00:00
Sanket Padawe
579b66f28d
Getting mcc/mnc from system prop instead of subInfoRecord.
...
Bug: 18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
2014-12-17 19:31:30 -08:00
Fyodor Kupolov
c7f09da972
Merge "Disable CryptKeeper activity for secondary users"
2014-12-17 21:22:11 +00:00
Geoff Mendal
889ce2281f
am c5fdbe82
: (-s ours) am 3a92fb26
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'c5fdbe8271f6f34baa27521d6146fbc6e7429a58':
Import translations. DO NOT MERGE
2014-12-17 14:42:24 +00:00
Geoff Mendal
1ecc00d870
Merge "Import translations. DO NOT MERGE"
2014-12-17 14:40:40 +00:00
Geoff Mendal
3c08ea9741
Import translations. DO NOT MERGE
...
Change-Id: Ie9e5f675f83b6e8b48302066d22578c23f96f070
Auto-generated-cl: translation import
2014-12-17 06:39:27 -08:00
Geoff Mendal
c5fdbe8271
am 3a92fb26
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '3a92fb2693925f804964914728f40eb94c0c2bfb':
Import translations. DO NOT MERGE
2014-12-17 14:37:24 +00:00
Geoff Mendal
acad157fed
am e1ea5a5c
: (-s ours) am b4ff0269
: (-s ours) am 3b08bdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e1ea5a5c8e4ed8b327603958492778550059664a':
Import translations. DO NOT MERGE
2014-12-17 14:37:12 +00:00
Geoff Mendal
3a92fb2693
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-17 14:33:27 +00:00
Geoff Mendal
e1ea5a5c8e
am b4ff0269
: (-s ours) am 3b08bdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b4ff026930c1578cb8d6644a40169946758b70ce':
Import translations. DO NOT MERGE
2014-12-17 14:31:17 +00:00
Geoff Mendal
181494318c
Import translations. DO NOT MERGE
...
Change-Id: I37ca51108f533323a830a9fcb550af4b94a2b2a3
Auto-generated-cl: translation import
2014-12-17 06:28:32 -08:00
Geoff Mendal
b4ff026930
am 3b08bdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3b08bdec9415a99190cf6f93837c41cea5e0c04a':
Import translations. DO NOT MERGE
2014-12-17 14:26:09 +00:00
Geoff Mendal
3b08bdec94
Import translations. DO NOT MERGE
...
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
2014-12-17 06:18:00 -08:00
Alan Viverette
2097056679
Merge "Show a toast when filtering obscured touch input"
2014-12-17 00:54:12 +00:00
Alan Viverette
3c682c32a4
Show a toast when filtering obscured touch input
...
We can't verify user consent if the touch input is obscured, so the
best we can do is fail with an informative message.
BUG: 18082299
Change-Id: I99bea51171d998c0e0ba58dd7bbf1167d4af925d
2014-12-16 16:51:19 -08:00
Alexandra Gherghina
cf054c0b74
Merge "Make spinner icons circular"
2014-12-16 20:47:10 +00:00
Jason Monk
2e904fdd28
am c0ecaeef
: am 5aaa4b63
: am b0c8c393
: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
...
* commit 'c0ecaeefe8d22c8dbd77c51090cb55e1c448b983':
Add a periodic check of the tethering provisioning
2014-12-16 17:11:29 +00:00
Jason Monk
c0ecaeefe8
am 5aaa4b63
: am b0c8c393
: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
...
* commit '5aaa4b63bd6ee0639ee067e3287e5d97b692a444':
Add a periodic check of the tethering provisioning
2014-12-16 17:05:14 +00:00
Jason Monk
5aaa4b63bd
am b0c8c393
: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
...
* commit 'b0c8c3935d5842cfefbe96d958d537fb80d4a33e':
Add a periodic check of the tethering provisioning
2014-12-16 16:59:47 +00:00
Jason Monk
b0c8c3935d
Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
2014-12-16 15:44:27 +00:00
Sanket Padawe
506c13fd30
am ccb9fcfa
: am 996724ea
: am 7131f1a9
: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
...
* commit 'ccb9fcfa1fa6d19e8d7ce60c592e4338d4a3575c':
Prevent sim notify popup after upgrade from k to LMR1.
2014-12-16 11:02:49 +00:00
Sanket Padawe
38f3eacf21
am 622fe174
: am b92f3368
: am d0591276
: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
...
* commit '622fe17483874f98b0a2bba56bcc2bfea6f416cd':
Exiting activity on clicking outside dialog acitivity.
2014-12-16 11:02:45 +00:00
Sanket Padawe
ccb9fcfa1f
am 996724ea
: am 7131f1a9
: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
...
* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
Prevent sim notify popup after upgrade from k to LMR1.
2014-12-16 03:00:41 +00:00
Sanket Padawe
622fe17483
am b92f3368
: am d0591276
: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
...
* commit 'b92f336886f34358f122ed101c082ccca7a44c79':
Exiting activity on clicking outside dialog acitivity.
2014-12-16 03:00:39 +00:00
Sanket Padawe
996724ea6d
am 7131f1a9
: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
...
* commit '7131f1a99cd87d452a1ab915333d7b1dbdfb9114':
Prevent sim notify popup after upgrade from k to LMR1.
2014-12-16 02:49:36 +00:00
Sanket Padawe
b92f336886
am d0591276
: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
...
* commit 'd059127659048d9f26a79e22728068c709e2d831':
Exiting activity on clicking outside dialog acitivity.
2014-12-16 02:49:35 +00:00
Fyodor Kupolov
1b5cc427f0
Disable CryptKeeper activity for secondary users
...
For secondary users, disable CryptKeeper activity in a broadcast receiver of
USER_INITIALIZE intent. This change has the following benefits for guest
user switching:
- The code will be executed earlier in the user switching flow, when the
screen is frozen by WindowManager.
- Initialization of CryptKeeperActivity is skipped
Bug:18670536
Change-Id: I60300198b605c26ad15afe2c874d5f1be7da5087
2014-12-16 02:48:36 +00:00
Sanket Padawe
7131f1a99c
Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
2014-12-16 02:42:29 +00:00
Sanket Padawe
d059127659
Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev
2014-12-16 02:42:17 +00:00
PauloftheWest
ee6426af18
am 7741dff8
: am 4fe583d4
: Merge "Made the WPS icon visisble." into lmp-mr1-dev automerge: 3df1fe0
...
* commit '7741dff861d341d427025a5147b9fadc4f3484b9':
Made the WPS icon visisble.
2014-12-16 01:48:21 +00:00
PauloftheWest
7dd0de5382
am 5200f61e
: am c6f5c924
: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev automerge: 735e93e
...
* commit '5200f61ede468ce782a0ae7a71df07ce948fb7f6':
Fixed then icons of SIMs in the call dialog.
2014-12-16 01:48:19 +00:00
PauloftheWest
7741dff861
am 4fe583d4
: Merge "Made the WPS icon visisble." into lmp-mr1-dev
...
automerge: 3df1fe0
* commit '3df1fe080f27ef46f1f3b03125391f0166af8664':
Made the WPS icon visisble.
2014-12-16 01:41:58 +00:00
PauloftheWest
5200f61ede
am c6f5c924
: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
...
automerge: 735e93e
* commit '735e93e52c59e13a27f24170c5e41ca22d5e4e6a':
Fixed then icons of SIMs in the call dialog.
2014-12-16 01:41:48 +00:00
PauloftheWest
3df1fe080f
am 4fe583d4
: Merge "Made the WPS icon visisble." into lmp-mr1-dev
...
* commit '4fe583d4cf2e2f3ba86f80e8695b104234d714eb':
Made the WPS icon visisble.
2014-12-16 00:54:21 +00:00
PauloftheWest
735e93e52c
am c6f5c924
: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
...
* commit 'c6f5c924d8a796da1a3c2e6bd5e44c755a532771':
Fixed then icons of SIMs in the call dialog.
2014-12-16 00:54:20 +00:00
PauloftheWest
4fe583d4cf
Merge "Made the WPS icon visisble." into lmp-mr1-dev
2014-12-15 22:49:24 +00:00
Wink Saville
0bf96d604f
am 6ac0cef0
: am 870a2a8e
: am e04fd76f
: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
...
* commit '6ac0cef01b655de3665e8750566fa10dac0e5697':
Use getLIn1NumberForSubscriber to get phone number.
2014-12-15 22:47:01 +00:00
Stuart Scott
997a734faa
am e84524ef
: am 56db3f35
: am b62bfe71
: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
...
* commit 'e84524efc86517766797fd1614093c08dcb60b2c':
Show toast when cellular data option is changing.
2014-12-15 22:47:00 +00:00