John Spurlock
624dd5ce9d
Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev
2014-10-21 18:16:47 +00:00
Alan Viverette
3d52809bad
Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev
2014-10-21 18:16:25 +00:00
Alan Viverette
46b4920ac8
Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev
2014-10-21 18:14:50 +00:00
John Spurlock
7bbb9f6410
Sysui: Include shared prefs in service dump.
...
Also:
- Remove obsolete Prefs helper.
- Use common file for zen-mode prefs.
Bug: 18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
2014-10-21 12:26:45 -04:00
Geoff Mendal
a9a550dd8e
am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'deddb38462389823c194559052c4d64ee6c3b467':
Import translations. DO NOT MERGE
2014-10-20 23:43:33 +00:00
Geoff Mendal
deddb38462
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-20 23:39:58 +00:00
Geoff Mendal
e8d005429c
Import translations. DO NOT MERGE
...
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
2014-10-20 16:21:14 -07:00
Jinsuk Kim
17e9d2468f
Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev
2014-10-20 22:50:37 +00:00
RoboErik
01c9d330b7
am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
...
* commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3':
Add missing break to switch statement
2014-10-20 22:19:54 +00:00
Amit Mahajan
1213bf83e9
Merge "Add a constant for invalid profile id value" into lmp-mr1-dev
2014-10-20 22:17:39 +00:00
Jinsuk Kim
b22d9ee0a3
CEC: Add missing protections for some HdmiControlService API
...
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.
Bug: 17408780
Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
2014-10-21 07:14:46 +09:00
RoboErik
f0a284115a
am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
...
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
Add missing break to switch statement
2014-10-20 22:14:10 +00:00
RoboErik
2fa604fc59
Merge "Add missing break to switch statement" into lmp-dev
2014-10-20 22:08:07 +00:00
RoboErik
59759903a9
Add missing break to switch statement
...
the skip to queue item case was falling through when it shouldn't.
bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
2014-10-20 14:56:32 -07:00
Griff Hazen
6e1eb1c966
am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev
...
* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
Disable zen log printouts by default
2014-10-20 21:46:12 +00:00
Wei Wang
2959231c78
am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
...
* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
Remove spammy log information for BLE scan.
2014-10-20 21:46:08 +00:00
smain@google.com
3f256d5295
am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights.
...
* commit 'ae6dc92c3d39862e97a778ea69943ee37a78e92b':
Doc change: misc changes to highlights.
2014-10-20 21:46:00 +00:00
Griff Hazen
aec92e2eca
Merge "Disable zen log printouts by default" into lmp-sprout-dev
2014-10-20 21:43:16 +00:00
Alan Viverette
f81c6af10e
Propagate state changes even when we don't change drawable index
...
Previously we could miss the state change if we were simply reversing the
current transition.
BUG: 17967405
Change-Id: I2cb396dedbff61b980741ef8c0d931be6abe129c
2014-10-20 14:42:53 -07:00
Wei Wang
33bb6c2d3c
Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
2014-10-20 21:41:29 +00:00
smain@google.com
ae6dc92c3d
am 21de5f3f: Doc change: misc changes to highlights.
...
* commit '21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
Doc change: misc changes to highlights.
2014-10-20 21:40:11 +00:00
smain@google.com
21de5f3f12
Doc change: misc changes to highlights.
...
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
2014-10-20 14:34:22 -07:00
Wink Saville
f44628e313
am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev
...
* commit '6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
Radio Capability Support.
2014-10-20 21:24:27 +00:00
Wink Saville
6bacccbfbc
Merge "Radio Capability Support." into lmp-sprout-dev
2014-10-20 21:17:29 +00:00
Adam Lesinski
6dfe03ae6c
am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
...
* commit '73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c':
AAPT: Fix path for final generated resources on Windows
2014-10-20 21:05:04 +00:00
Griff Hazen
1aad144c8f
Disable zen log printouts by default
...
Bug: 18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
2014-10-20 14:02:59 -07:00
Adam Lesinski
73a8c5962d
am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
...
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
AAPT: Fix path for final generated resources on Windows
2014-10-20 21:00:23 +00:00
Adam Lesinski
3f8c7dec6b
Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
2014-10-20 20:55:48 +00:00
ztenghui
12d808a24f
am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev
...
* commit 'a724d1ab4083f08958bd88e76e15b7c0af337bfc':
Make sure the bitmap from VD's cache is drawn using bi-linear filter.
2014-10-20 20:42:51 +00:00
ztenghui
a724d1ab40
am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev
...
* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
Make sure the bitmap from VD's cache is drawn using bi-linear filter.
2014-10-20 20:35:58 +00:00
ztenghui
877ce2c42b
Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev
2014-10-20 20:29:17 +00:00
John Spurlock
3babc728e0
Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev
2014-10-20 20:15:38 +00:00
RoboErik
d00e68c3b6
am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
...
* commit '26a4309492f5af6828738a469ad8f18f42c44a61':
Set the metadata rating correctly in RCC
2014-10-20 19:20:32 +00:00
Adam Lesinski
aff7c2447d
AAPT: Fix path for final generated resources on Windows
...
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
2014-10-20 12:15:25 -07:00
RoboErik
26a4309492
am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
...
* commit '578fbe898f1652b3166bd4e20647572dec9dfb14':
Set the metadata rating correctly in RCC
2014-10-20 19:13:20 +00:00
RoboErik
578fbe898f
Merge "Set the metadata rating correctly in RCC" into lmp-dev
2014-10-20 19:07:52 +00:00
Alan Viverette
e28cd1a276
Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
2014-10-20 19:00:36 +00:00
Hui Wang
d61cc80ef1
Add a constant for invalid profile id value
...
Change-Id: I0cac2e38572e4b04081fd3347be05e57cc899008
2014-10-20 10:41:09 -07:00
John Spurlock
9b84309bea
Qualify private outer call in MediaProjectionManagerService.
...
Change-Id: Ia4e09bdfe773a27107c0980a1aabf9b09e2b0a46
2014-10-20 13:37:48 -04:00
Libin.Tang@motorola.com
846b71daaf
change setProvisionedValue/setProvisionedStringValue to
...
return operation result.
Change-Id: I24f127280d4692633ede7e17a63ababee1b6c71f
2014-10-20 17:33:44 +00:00
Wink Saville
2af2d57d57
Radio Capability Support.
...
New design of capability switch for L.
Add new RIL requests:
RIL_REQUEST_GET_RADIO_CAPABILITY
RIL_REQUEST_SET_RADIO_CAPABILITY
RIL_UNSOL_RADIO_CAPABILITY
These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.
It can support 2/3/4G switch and has flexible architecture to support
future technology.
Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
2014-10-20 10:31:05 -07:00
Dmitriy Ivanov
604d317205
Merge "Link sigchain to main executable" into lmp-mr1-dev
2014-10-20 17:14:54 +00:00
Geoff Mendal
85f079ee58
am 2f831575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '2f831575253e4f5a9e329e857aad2cd816f47524':
Import translations. DO NOT MERGE
2014-10-20 17:08:30 +00:00
Geoff Mendal
d186d919d6
am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1d5af7b743fa32ca291d57a0b8b6998f7761c94d':
Import translations. DO NOT MERGE
2014-10-20 17:08:27 +00:00
smain@google.com
cc46a0e3f2
am dadc7d25: am 065b94c6: update workplace description in lollipop highlights bug: 18038081
...
* commit 'dadc7d25ea997792c8348f22b18238ab19c73756':
update workplace description in lollipop highlights bug: 18038081
2014-10-20 17:03:09 +00:00
Geoff Mendal
2f83157525
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-20 17:02:55 +00:00
Geoff Mendal
1d5af7b743
am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '00831836cdeeb4a61ba10c724c3ca33280937b62':
Import translations. DO NOT MERGE
2014-10-20 17:02:10 +00:00
Geoff Mendal
d8439a8d67
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-20 16:57:38 +00:00
smain@google.com
dadc7d25ea
am 065b94c6: update workplace description in lollipop highlights bug: 18038081
...
* commit '065b94c6a634e7a765f2674cff696a75e76f6425':
update workplace description in lollipop highlights bug: 18038081
2014-10-20 16:57:22 +00:00
Geoff Mendal
00831836cd
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-20 16:56:51 +00:00