Commit Graph

13880 Commits

Author SHA1 Message Date
Baligh Uddin
e2b0278fa3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-01 14:46:21 +00:00
Shuhrat Dehkanov
7e77699895 Move a line into try block
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2013-11-01 17:39:44 +09:00
Satoshi Kataoka
6c08377ce8 am 67b3039d: am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs
* commit '67b3039d37c0ca4b4314129bb151183fde614aed':
  Fix a bug on updating enabled IMEs
2013-10-31 15:13:47 -07:00
Satoshi Kataoka
67b3039d37 am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs
* commit '2cab1344037ada26710047138b59c2f8f0f4dfee':
  Fix a bug on updating enabled IMEs
2013-10-31 15:10:17 -07:00
Satoshi Kataoka
2cab134403 am aa4fa0ea: Fix a bug on updating enabled IMEs
* commit 'aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
  Fix a bug on updating enabled IMEs
2013-10-31 15:07:11 -07:00
Satoshi Kataoka
aa4fa0ea09 Fix a bug on updating enabled IMEs
Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
2013-11-01 07:00:13 +09:00
Baligh Uddin
c0d9c7b324 Import translations. DO NOT MERGE
Change-Id: I273241a8e35b1d297916d59a7f0900a9ab20863a
Auto-generated-cl: translation import
2013-10-30 11:26:56 -07:00
Baligh Uddin
ac093063b0 Import translations. DO NOT MERGE
Change-Id: Ie376be991f9d022ac5b4f066c7946d44d4175c2e
Auto-generated-cl: translation import
2013-10-30 11:23:02 -07:00
The Android Automerger
ec8290b4f8 merge in master-release history after reset to master 2013-10-30 07:50:30 -07:00
Chris Wren
a32331de8b am ed4c3aac: am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit 'ed4c3aacfb020886d420299523059b37abd3f415':
  remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:05:13 -07:00
Chris Wren
ed4c3aacfb am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '455bf4d3395e828dfbeca1f2ef5696e960874ad1':
  remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:01:47 -07:00
Chris Wren
455bf4d339 am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
  remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 11:59:53 -07:00
Chris Wren
1630ef4fc5 remove lockscreen widget checkbox when there's no lockscreen.
Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
2013-10-29 13:42:05 -04:00
The Android Automerger
3909f1eae1 merge in master-release history after reset to master 2013-10-29 07:50:27 -07:00
Baligh Uddin
1c144e2a6d am 91d3ccff: (-s ours) am 31735215: (-s ours) am b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit '91d3ccffeb48963b06864730fbca03755588d0fc':
  Import translations. DO NOT MERGE
2013-10-28 20:51:41 -07:00
Baligh Uddin
91d3ccffeb am 31735215: (-s ours) am b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit '317352151ba7e84be66a01f5c8c2585ea1aacb6f':
  Import translations. DO NOT MERGE
2013-10-28 20:48:12 -07:00
Baligh Uddin
317352151b am b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit 'b9687f3b4ef392dbeddeeeb9de9e0b5e51f44a2f':
  Import translations. DO NOT MERGE
2013-10-28 20:44:53 -07:00
Baligh Uddin
96c95b0d94 Import translations. DO NOT MERGE
Change-Id: Ic475e167a5d113bae5f55cadb821237be30e919c
Auto-generated-cl: translation import
2013-10-28 15:23:39 -07:00
Baligh Uddin
b9687f3b4e Import translations. DO NOT MERGE
Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import
2013-10-28 15:19:24 -07:00
The Android Automerger
4c5938f2b9 merge in master-release history after reset to master 2013-10-28 07:51:17 -07:00
Baligh Uddin
17edb78217 Merge "Import translations. DO NOT MERGE" 2013-10-26 03:30:23 +00:00
Jeff Sharkey
457284e858 am 8cd39351: am bd5cbb04: am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit '8cd39351fe9d1164a06bb4420e2b95c5dd9259fb':
  remove primary condition check on storage format.
2013-10-25 16:14:01 -07:00
Jeff Sharkey
8cd39351fe am bd5cbb04: am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit 'bd5cbb0400366faade3586e19f1deae2350c0ddd':
  remove primary condition check on storage format.
2013-10-25 15:06:12 -07:00
Jeff Sharkey
bd5cbb0400 am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit 'fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
  remove primary condition check on storage format.
2013-10-25 15:02:50 -07:00
Jeff Sharkey
fd845410aa Merge "remove primary condition check on storage format." into klp-dev 2013-10-25 22:00:07 +00:00
Pierre
93df01e3a7 remove primary condition check on storage format.
this change seemed to have been introduced originally
via commit d2a6f28fa7
as a workaround to fix interoperability problem with MTP,
then commit 8218d3ba18
seemed to have address this problem.

therefore it looks like removing the original restriction
is in order to allow formating of the sd-card when not
primary storage.

Bug: 11352632
Change-Id: I0419135a607dac08c44a3f30a7ccdcad17c46437
Signed-off-by: Pierre <pierre@broadcom.com>
2013-10-25 13:12:28 -07:00
Andrew Flynn
d1808bd6c8 Merge "Check for presence of carrier app in Mobile Plan." 2013-10-25 19:55:22 +00:00
Baligh Uddin
02b6a47df8 am c42d3174: (-s ours) am 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c42d3174675ba909df526af3daec07bbc83c94df':
  Import translations. DO NOT MERGE
2013-10-25 12:26:39 -07:00
Baligh Uddin
c42d317467 am 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '0728400a7943303b26d0f60e52050dc1fb496c68':
  Import translations. DO NOT MERGE
2013-10-25 12:25:00 -07:00
Baligh Uddin
0728400a79 am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '9271875c129d000a98a7a1fcd11f09041f26455c':
  Import translations. DO NOT MERGE
2013-10-25 12:22:49 -07:00
Baligh Uddin
9271875c12 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-25 19:21:06 +00:00
Baligh Uddin
0707038005 Import translations. DO NOT MERGE
Change-Id: I485d5d31cfd721f5bec653c6d131fb89cfa628b6
Auto-generated-cl: translation import
2013-10-25 11:44:06 -07:00
Baligh Uddin
144cdee03c Import translations. DO NOT MERGE
Change-Id: If2ea17bb82d79c6a722bfa2360db9dbee83d008d
Auto-generated-cl: translation import
2013-10-25 11:40:25 -07:00
Zhihai Xu
5e0b5bd100 am f8ac9d60: am c9c92647: am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit 'f8ac9d60d4da1a467e02b658d08f3d140f074390':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:19:37 -07:00
Zhihai Xu
f8ac9d60d4 am c9c92647: am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit 'c9c92647d1ab0f75c9f7a499e05fd556c96fa128':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:17:15 -07:00
Zhihai Xu
c9c92647d1 am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit 'cb9d32e55f68446a3e696b0bd9f553f7d5d14dc4':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:15:55 -07:00
Zhihai Xu
cb9d32e55f Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev 2013-10-25 18:12:48 +00:00
Wink Saville
64217355be am b557b89c: am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit 'b557b89c4dde4c760b1ce7c6317d3077378692e0':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:54:35 -07:00
Wink Saville
b557b89c4d am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '01b7ae29600f934d491cdc6dafdacf22821baf8d':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:49:34 -07:00
Wink Saville
01b7ae2960 am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '83671ff815f59a977b34297c94aa05b4b4e97d01':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:46:29 -07:00
Wink Saville
83671ff815 Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 2013-10-25 16:41:09 +00:00
The Android Automerger
b4c392199e merge in master-release history after reset to master 2013-10-24 07:51:19 -07:00
Baligh Uddin
c70aac671a am acc23ef6: (-s ours) am 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'acc23ef6995a567e3d14f827940748af2e439025':
  Import translations. DO NOT MERGE
2013-10-23 20:39:58 -07:00
Baligh Uddin
acc23ef699 am 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '315e78bd4d033e777426a46952a752d724278f18':
  Import translations. DO NOT MERGE
2013-10-23 20:38:22 -07:00
Baligh Uddin
315e78bd4d am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2ba4985526779a52826b933597b7817952e1d0a0':
  Import translations. DO NOT MERGE
2013-10-23 20:35:30 -07:00
Baligh Uddin
81f96c6b43 Merge "Import translations. DO NOT MERGE" 2013-10-24 03:33:39 +00:00
Baligh Uddin
2ba4985526 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-24 03:33:34 +00:00
Baligh Uddin
9e8b20b73e Import translations. DO NOT MERGE
Change-Id: I654010b903a3b8bb4cec6a288250380bd93070e0
Auto-generated-cl: translation import
2013-10-23 19:54:57 -07:00
Baligh Uddin
855d40a569 Import translations. DO NOT MERGE
Change-Id: Iea5d9695008ddc258cfead84f2494fb3111eefea
Auto-generated-cl: translation import
2013-10-23 19:50:57 -07:00
Wink Saville
8246579fa1 Display remaining attempts when using or changing SIM PIN
Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
2013-10-23 17:07:10 -07:00