Mark Salyzyn
3f7e5fc170
am ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf
...
* commit 'ce258caa4aa5cd1ea66b839ee7231c76fcfbc8d6':
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
Settings: logd: increase dialog title field size to 59
Settings: logd: increase summary field size to 30
2014-06-18 14:20:11 +00:00
Griff Hazen
3ba147712b
am bd042089: DO NOT MERGE Fix build for notification listener internal api change
...
* commit 'bd042089891d749855be5d39d76380e7c7f85e6f':
DO NOT MERGE Fix build for notification listener internal api change
2014-06-18 09:00:55 +00:00
Griff Hazen
bd04208989
DO NOT MERGE Fix build for notification listener internal api change
...
Bug: 15426276
Change-Id: I3861eb03796f9938f66237454aea148f5c64b370
2014-06-17 21:43:19 -07:00
Mark Salyzyn
ce258caa4a
Merge changes I8f067f14,I54d8255a,Ib15917bf
...
* changes:
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
Settings: logd: increase dialog title field size to 59
Settings: logd: increase summary field size to 30
2014-06-17 23:00:03 +00:00
Fabrice Di Meglio
07d976e431
Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
...
- prevent NPE
- define default value (to 256K)
- add more logs for showing value which has been set or any exception
Bug: 15687210
Change-Id: I8f067f14d81ee56631d1ad74b91b5ede26cae125
2014-06-17 10:55:20 -07:00
Mark Salyzyn
20f1b207d0
Settings: logd: increase dialog title field size to 59
...
Bug: 15660860
Change-Id: I54d8255a1fc28ff41e8d8adc693d2e66ff4cc311
2014-06-17 09:56:30 -07:00
Mark Salyzyn
44cf6b73b6
Settings: logd: increase summary field size to 30
...
Bug: 15661901
Bug: 15661903
Bug: 15644939
Bug: 15644940
Bug: 15662401
Bug: 15665444
Bug: 15668253
Change-Id: Ib15917bfdd4a1028d5d9d8ac4f7afe772a0ba77b
2014-06-17 09:48:51 -07:00
Mark Salyzyn
c2c64a312a
am 5a9a18c1: Merge "logd: Add Developer settings for size"
...
* commit '5a9a18c15b16be282ed48df0fa38045ae9016524':
logd: Add Developer settings for size
2014-06-13 20:27:25 +00:00
Mark Salyzyn
5a9a18c15b
Merge "logd: Add Developer settings for size"
2014-06-10 21:49:56 +00:00
Mark Salyzyn
408c89bfb5
logd: Add Developer settings for size
...
- Dependent on some logd/init/selinux security changes.
Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
2014-06-13 20:20:08 +00:00
Brian Carlstrom
f354290901
am 2ce0dcda: am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:26 +00:00
Brian Carlstrom
2ce0dcdad4
am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '70f2201c7ab842df6c45a1540803239eafa267ed':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:43 +00:00
Brian Carlstrom
70f2201c7a
Merge "Move to dalvik.vm.lib.2 to force default to libart"
2014-05-28 22:28:47 +00:00
Brian Carlstrom
9d7e2b1949
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
(cherry picked from commit 3bc8aaad29 )
Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
2014-05-28 14:48:15 -07:00
Baligh Uddin
a8e1e7c9d0
am 6a0bfc9f: (-s ours) Import translations. DO NOT MERGE
...
* commit '6a0bfc9f2b8989b971b12738906804b8e1abbdb5':
Import translations. DO NOT MERGE
2014-05-22 03:15:46 +00:00
Baligh Uddin
6a0bfc9f2b
Import translations. DO NOT MERGE
...
Change-Id: Idbb361c506a6d3d88653e6699b00d79c344b8c98
Auto-generated-cl: translation import
2014-05-21 14:52:35 -07:00
Jeff Sharkey
e4dd48939d
am 14f42ca9: am 110ddbfe: Merge "Fix NullPointerException issue when user change"
...
* commit '14f42ca9f46d2dafaadff2b0ccef645d66679bc7':
Fix NullPointerException issue when user change
2014-05-09 17:45:42 +00:00
Jeff Sharkey
14f42ca9f4
am 110ddbfe: Merge "Fix NullPointerException issue when user change"
...
* commit '110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
Fix NullPointerException issue when user change
2014-05-09 17:41:27 +00:00
Jeff Sharkey
110ddbfea0
Merge "Fix NullPointerException issue when user change"
2014-05-09 17:35:27 +00:00
Zhihai Xu
3cfb6885b4
am d6b0b172: am 7dd84651: Merge "Display BTH connected status correctly"
...
* commit 'd6b0b1721a684be1805025908c4733a6b02794a4':
Display BTH connected status correctly
2014-04-30 18:28:49 +00:00
Zhihai Xu
d6b0b1721a
am 7dd84651: Merge "Display BTH connected status correctly"
...
* commit '7dd84651a25566c5a2152d935f19a11cebfc58ae':
Display BTH connected status correctly
2014-04-30 18:25:22 +00:00
Zhihai Xu
7dd84651a2
Merge "Display BTH connected status correctly"
2014-04-30 18:22:49 +00:00
Tsuyoshi Kamata
89377530c7
Display BTH connected status correctly
...
This patch removes incorrect condition.
(to not use LocalBluetoothProfile#isPreferred())
This condition uses the priority that already disconnected profile,
so this codition always returns false.
To verify this issue:
1. Turn on Bluetooth.
2. Pair and connect to BTH(A2DP/HFP)
3. The display now says "Connected"
3. Disconnect HFP profile
4. The display still says "Connected" but it should say "Connected (no phone)"
Change-Id: I9e2bfa6d23bf1be7587c9556b4b05459d02c4817
2014-04-30 18:20:55 +00:00
Bill Yi
c88835851d
am a3860afc: Merge commit \'36a1bbe89025341987df0e380982cfbb4d09fe30\' into HEAD
...
* commit 'a3860afcb5a28971a223f201a17f2583c1109704':
2014-04-30 00:59:39 +00:00
Bill Yi
a3860afcb5
Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD
2014-04-29 11:34:27 -07:00
Jun Su
bf427a2064
Fix NullPointerException issue when user change
...
When info is null, we have risk to have access null point.
Change-Id: Ie6acee5c99d6297e31d46585435a735a38b19e82
2014-04-26 13:36:06 +08:00
Elliott Hughes
f90b514144
am 4c941850: Merge "Track MutableBoolean\'s new package."
...
* commit '4c941850288011ca29466a1a80314155c0100fe3':
Track MutableBoolean's new package.
2014-04-24 23:59:10 +00:00
Elliott Hughes
4c94185028
Merge "Track MutableBoolean's new package."
2014-04-24 23:52:13 +00:00
Elliott Hughes
309004706c
Track MutableBoolean's new package.
...
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
2014-04-23 18:04:40 -07:00
Baligh Uddin
293b1fc04d
am 06172af6: (-s ours) Import translations. DO NOT MERGE
...
* commit '06172af69451678f5d1dd388a372ab00b58d682f':
Import translations. DO NOT MERGE
2014-04-23 02:13:34 +00:00
Baligh Uddin
06172af694
Import translations. DO NOT MERGE
...
Change-Id: I9185da8de4b0c0818b926377543992356f265dd9
Auto-generated-cl: translation import
2014-04-22 17:59:15 -07:00
Christopher Tate
a83515813c
am 442f01c6: am 95228074: am c44d7c6b: Prohibit uninstall of the default (or only) home app
...
* commit '442f01c6018f2fddb413a730b54d2eae542b1078':
Prohibit uninstall of the default (or only) home app
2014-04-22 18:09:27 +00:00
Christopher Tate
442f01c601
am 95228074: am c44d7c6b: Prohibit uninstall of the default (or only) home app
...
* commit '95228074d2e01575799a526a29ec53a61c36aa23':
Prohibit uninstall of the default (or only) home app
2014-04-22 18:05:39 +00:00
Christopher Tate
95228074d2
am c44d7c6b: Prohibit uninstall of the default (or only) home app
...
* commit 'c44d7c6be64be790878ddf1f21c0d9e91d238245':
Prohibit uninstall of the default (or only) home app
2014-04-22 17:58:59 +00:00
Christopher Tate
c44d7c6be6
Prohibit uninstall of the default (or only) home app
...
We suppress the ability to uninstall (including uninstall of updates to
system-bundled apps) when the package in question is either the only
installed home app, or has been explicitly tagged by the user as the
"every time" home app among all those installed.
Bug 14162565
Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca
2014-04-22 10:42:10 -07:00
Baligh Uddin
89e96c308c
am 54b5982f: (-s ours) Import translations. DO NOT MERGE
...
* commit '54b5982f148290a00fa2ff38e7e30d487cf69998':
Import translations. DO NOT MERGE
2014-04-17 16:23:22 +00:00
Baligh Uddin
54b5982f14
Import translations. DO NOT MERGE
...
Change-Id: I20c3ae14070c3fae914ec7151dc425ddf518ffa6
Auto-generated-cl: translation import
2014-04-16 17:18:12 -07:00
Wink Saville
d5b8ee9ba4
am 242184ca: Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"
...
* commit '242184ca23b8ef70f5347874ac9b5c59cce36208':
Allow tablets to send SMS if enabled in device overlays (1/2)
2014-04-16 20:26:53 +00:00
Wink Saville
242184ca23
Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"
2014-04-16 20:21:57 +00:00
Baligh Uddin
ce077b417d
am 81ff7980: (-s ours) Import translations. DO NOT MERGE
...
* commit '81ff798050d4223dec7038cc466847e0d2ef999b':
Import translations. DO NOT MERGE
2014-04-16 15:43:33 +00:00
Baligh Uddin
81ff798050
Import translations. DO NOT MERGE
...
Change-Id: I571889dbba0de412f258289e097ec510fbf02e05
Auto-generated-cl: translation import
2014-04-14 12:41:44 -07:00
Baligh Uddin
e38487bf72
am b6b3172c: (-s ours) am 915ef6e3: (-s ours) am 52e3681f: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b6b3172c35646a6292ae312fb23795afafb4c96b':
Import translations. DO NOT MERGE
2014-04-10 16:06:37 +00:00
Baligh Uddin
119758c972
am 2632b25f: (-s ours) am fba8cd35: (-s ours) Import translations. DO NOT MERGE
...
* commit '2632b25fae55411ff4974d510d599af75d35045a':
Import translations. DO NOT MERGE
2014-04-10 16:03:05 +00:00
Baligh Uddin
b6b3172c35
am 915ef6e3: (-s ours) am 52e3681f: (-s ours) Import translations. DO NOT MERGE
...
* commit '915ef6e3127b34c73d43e86149b9aabc23216e72':
Import translations. DO NOT MERGE
2014-04-10 16:02:35 +00:00
Baligh Uddin
915ef6e312
am 52e3681f: (-s ours) Import translations. DO NOT MERGE
...
* commit '52e3681feb64afaefd5cffa5a9e88a97bca4d48d':
Import translations. DO NOT MERGE
2014-04-10 16:00:02 +00:00
Baligh Uddin
bb58405fee
am 8bec9dba: (-s ours) Import translations. DO NOT MERGE
...
* commit '8bec9dba479ba901c913f59c7585369af1bf639d':
Import translations. DO NOT MERGE
2014-04-10 15:59:28 +00:00
Baligh Uddin
2632b25fae
am fba8cd35: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fba8cd35b71853118508eab15a3cbef96a539dec':
Import translations. DO NOT MERGE
2014-04-10 15:57:44 +00:00
Baligh Uddin
fba8cd35b7
Import translations. DO NOT MERGE
...
Change-Id: Iff7d2cccff323a2cfb7193d399e8910f226304d7
Auto-generated-cl: translation import
2014-04-09 12:46:43 -07:00
Baligh Uddin
8bec9dba47
Import translations. DO NOT MERGE
...
Change-Id: I8cec72991260fa660991ca7423299bbf417df000
Auto-generated-cl: translation import
2014-04-09 12:43:07 -07:00
Baligh Uddin
52e3681feb
Import translations. DO NOT MERGE
...
Change-Id: I84d923dacf746299500503257fd925228b869e82
Auto-generated-cl: translation import
2014-04-09 12:41:44 -07:00