OSDN Git Service
Alexandra Gherghina [Mon, 10 Nov 2014 14:30:14 +0000 (14:30 +0000)]
am
e5332972: am
72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev
* commit '
e5332972119319c747976f0e7dbee6388295b937':
Clarify documentation for DevicePolicyManager
Alexandra Gherghina [Mon, 10 Nov 2014 14:24:58 +0000 (14:24 +0000)]
am
72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev
* commit '
72e32fd55538715f72299a08e14834257847d8dc':
Clarify documentation for DevicePolicyManager
John Spurlock [Mon, 10 Nov 2014 14:21:24 +0000 (14:21 +0000)]
am
4a150c8b: am
bc836514: Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev
* commit '
4a150c8b0293ba49b7b3974570d718b29ab1bd8f':
QS: Icon animation update for existing animations.
John Spurlock [Mon, 10 Nov 2014 14:21:18 +0000 (14:21 +0000)]
am
de3255cb: am
b836befe: Merge "QS: Animated hotspot tile icon." into lmp-mr1-dev
* commit '
de3255cb218c04bf372efac66057d302e4c2397c':
QS: Animated hotspot tile icon.
John Spurlock [Mon, 10 Nov 2014 14:21:12 +0000 (14:21 +0000)]
am
3bdbdbef: am
bc1e39af: Merge "Volume dialog: Add zen mode icons and notification access." into lmp-mr1-dev
* commit '
3bdbdbefe4c38e841ddba899d6e5b1d30b515639':
Volume dialog: Add zen mode icons and notification access.
Alexandra Gherghina [Mon, 10 Nov 2014 14:19:31 +0000 (14:19 +0000)]
Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev
John Spurlock [Mon, 10 Nov 2014 14:14:34 +0000 (14:14 +0000)]
am
bc836514: Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev
* commit '
bc8365148f9493ba7e90a8369add31fb712fd9ab':
QS: Icon animation update for existing animations.
John Spurlock [Mon, 10 Nov 2014 14:14:29 +0000 (14:14 +0000)]
am
b836befe: Merge "QS: Animated hotspot tile icon." into lmp-mr1-dev
* commit '
b836befec1d18c07f8bf08273ad3d49c26701ef7':
QS: Animated hotspot tile icon.
John Spurlock [Mon, 10 Nov 2014 14:14:24 +0000 (14:14 +0000)]
am
bc1e39af: Merge "Volume dialog: Add zen mode icons and notification access." into lmp-mr1-dev
* commit '
bc1e39af5024f38492d941f9beb9544adeb50ddf':
Volume dialog: Add zen mode icons and notification access.
John Spurlock [Mon, 10 Nov 2014 14:09:21 +0000 (14:09 +0000)]
Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev
John Spurlock [Mon, 10 Nov 2014 14:09:00 +0000 (14:09 +0000)]
Merge "QS: Animated hotspot tile icon." into lmp-mr1-dev
John Spurlock [Mon, 10 Nov 2014 14:08:51 +0000 (14:08 +0000)]
Merge "Volume dialog: Add zen mode icons and notification access." into lmp-mr1-dev
John Spurlock [Sat, 8 Nov 2014 17:40:19 +0000 (12:40 -0500)]
Volume dialog: Add zen mode icons and notification access.
- Add icon above text to all three zen mode states, update text style.
- Remove zentoast.
- Update shared borderless rect background, masks now support shapes.
- Update size of volume stream icons.
- Ensure all volume icons are expressions of white.
- Make volume icons testable via new demo mode command.
- Add a divider + secondary icon to access the notification slider.
- Animate the transition when accessing notification slider.
Bug:
18206097
Bug:
16303068
Bug:
18102850
Change-Id: I5eb6f820dc317e89be272cc78f6c80ed969ad5e9
Alexandra Gherghina [Fri, 7 Nov 2014 11:18:12 +0000 (11:18 +0000)]
Clarify documentation for DevicePolicyManager
Bug:
17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
Jungshik Jang [Mon, 10 Nov 2014 01:10:31 +0000 (01:10 +0000)]
am
7403d656: am
324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev
* commit '
7403d656470dd7b4875e006410e257795a09d183':
CEC: Send <Give System Audio Mode> regardless of TV's setting.
Jungshik Jang [Mon, 10 Nov 2014 00:58:55 +0000 (00:58 +0000)]
am
324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev
* commit '
324b1f8a4729b226c9f282eb870359dd02847441':
CEC: Send <Give System Audio Mode> regardless of TV's setting.
Jungshik Jang [Mon, 10 Nov 2014 00:54:30 +0000 (00:54 +0000)]
Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev
John Spurlock [Sun, 9 Nov 2014 23:37:19 +0000 (18:37 -0500)]
QS: Animated hotspot tile icon.
Bug:
17426910
Change-Id: Ic7d0219b0a5d749223c35fcbedca78d4adf585c5
John Spurlock [Sun, 9 Nov 2014 23:24:16 +0000 (18:24 -0500)]
QS: Icon animation update for existing animations.
- Remove starting delay.
- Remove alpha on <group>s.
Bug:
17426910
Change-Id: I497cb1ca07df865e693c24e9726fd7e80dffa03c
Adam Powell [Sun, 9 Nov 2014 19:27:31 +0000 (19:27 +0000)]
am
61effdd2: am
e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev
* commit '
61effdd2c2c945504fd788ee0dce5ccc5d57e66b':
Don't register more receivers and observers for every DateTimeView
Adam Powell [Sun, 9 Nov 2014 19:23:04 +0000 (19:23 +0000)]
am
e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev
* commit '
e5a6f821399bf354520f08f77819af4a846ae5f1':
Don't register more receivers and observers for every DateTimeView
Adam Powell [Sun, 9 Nov 2014 19:18:51 +0000 (19:18 +0000)]
Merge "Don't register more receivers and observers for every DateTimeView" into lmp-mr1-dev
Andreas Gampe [Sun, 9 Nov 2014 17:44:56 +0000 (17:44 +0000)]
am
6973e2c2: Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE automerge:
88d12e5 -s ours automerge:
aed8e76 -s ours
* commit '
6973e2c26f1ecd96e17a6211ae99d85582894678':
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
Andreas Gampe [Sun, 9 Nov 2014 16:49:47 +0000 (16:49 +0000)]
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE automerge:
88d12e5 -s ours
automerge:
aed8e76 -s ours
* commit '
aed8e76172477c884ec7bef659f050d0817efb7d':
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
Andreas Gampe [Sun, 9 Nov 2014 16:28:10 +0000 (16:28 +0000)]
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
automerge:
88d12e5 -s ours
* commit '
88d12e5f7bdd85323aacacffb6950a336132df67':
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
Andreas Gampe [Fri, 7 Nov 2014 23:43:00 +0000 (15:43 -0800)]
Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
Tighter list derived from usage.
Bug:
18248625
Change-Id: I3796fc13f880b1219579103c81bc2d1d727eb4df
Andreas Gampe [Sun, 9 Nov 2014 00:48:11 +0000 (00:48 +0000)]
am
189bf056: Merge "Frameworks/base: Fix more warnings"
* commit '
189bf05616b854f0319c7329a96e63ad374fd6c0':
Frameworks/base: Fix more warnings
Andreas Gampe [Sun, 9 Nov 2014 00:37:42 +0000 (00:37 +0000)]
Merge "Frameworks/base: Fix more warnings"
Jim Miller [Sat, 8 Nov 2014 13:45:08 +0000 (13:45 +0000)]
am
c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge:
5292069
* commit '
c6a042401a740b360790f71884b66fd3a2a09447':
Change Configure structure to List<PersistableBundle>
Andreas Gampe [Sat, 8 Nov 2014 06:24:57 +0000 (22:24 -0800)]
Frameworks/base: Fix more warnings
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.
Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
Jim Miller [Sat, 8 Nov 2014 03:36:38 +0000 (03:36 +0000)]
Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev
automerge:
5292069
* commit '
529206907f178d394cf1643d39f86c9dbc40e310':
Change Configure structure to List<PersistableBundle>
Mike Lockwood [Sat, 8 Nov 2014 03:00:35 +0000 (03:00 +0000)]
am
d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge:
95c05a5
* commit '
d73463c61a9ada1083155214be15ba3c653b73f5':
Add dumpsys support for bluetooth
Adam Lesinski [Sat, 8 Nov 2014 03:00:29 +0000 (03:00 +0000)]
am
b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge:
96f635e
* commit '
b94de814479749818e30dace03c70697485c7809':
UsageStatsService: Update file index to prevent double checkin
Jeff Sharkey [Sat, 8 Nov 2014 03:00:02 +0000 (03:00 +0000)]
am
6e2e4b73: Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev automerge:
9a2db6b
* commit '
6e2e4b7343eeae8ac8439bcf6bf3678609b4a230':
Resurrect dusty PackageManagerTests.
Amith Yamasani [Sat, 8 Nov 2014 02:59:55 +0000 (02:59 +0000)]
am
1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge:
395b519
* commit '
1aeab291764b77ffa2c6e6eb28441beec6fa041c':
Inform PendingIntent sender if broadcast was not queued.
Jim Miller [Sat, 8 Nov 2014 02:37:16 +0000 (02:37 +0000)]
Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev
Mike Lockwood [Sat, 8 Nov 2014 02:31:31 +0000 (02:31 +0000)]
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
automerge:
95c05a5
* commit '
95c05a590f97d81a5d4e5d86540833cc1637ffdc':
Add dumpsys support for bluetooth
Adam Lesinski [Sat, 8 Nov 2014 02:30:31 +0000 (02:30 +0000)]
Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev
automerge:
96f635e
* commit '
96f635ed5b30507b2a6d72c2547d4784fe53ac3d':
UsageStatsService: Update file index to prevent double checkin
Jeff Sharkey [Sat, 8 Nov 2014 02:29:18 +0000 (02:29 +0000)]
Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev
automerge:
9a2db6b
* commit '
9a2db6bfb9cb24d3b5b02fe3dc43a7e9699a40bf':
Resurrect dusty PackageManagerTests.
Amith Yamasani [Sat, 8 Nov 2014 02:28:24 +0000 (02:28 +0000)]
Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev
automerge:
395b519
* commit '
395b519f4bfec6e1c171aaca2c62a75a5c07de07':
Inform PendingIntent sender if broadcast was not queued.
Mike Lockwood [Sat, 8 Nov 2014 02:15:25 +0000 (02:15 +0000)]
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
Andreas Gampe [Sat, 8 Nov 2014 02:11:03 +0000 (02:11 +0000)]
am
9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage"
* commit '
9ade8c1ad59a40f1a2fdbe88074d05aa97a95aff':
Frameworks/base: Wall Werror in libs/storage
Adam Lesinski [Sat, 8 Nov 2014 02:07:44 +0000 (02:07 +0000)]
Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev
Andreas Gampe [Sat, 8 Nov 2014 02:04:43 +0000 (02:04 +0000)]
am
f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"
* commit '
f89a2fdacb2ba907f180188dc79f9de81e3eb254':
Frameworks/base: Fix two warnings in cmds
Jeff Sharkey [Sat, 8 Nov 2014 01:56:59 +0000 (01:56 +0000)]
Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev
Amith Yamasani [Sat, 8 Nov 2014 01:39:11 +0000 (01:39 +0000)]
Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev
Adam Lesinski [Fri, 7 Nov 2014 23:55:33 +0000 (15:55 -0800)]
UsageStatsService: Update file index to prevent double checkin
We seem to have renamed a file as checked-in twice, which means
we checked it in twice and created a malformed name with the suffix
"-c-c" instead of the correct suffix "-c".
Bug:
18280677
Change-Id: Ie3164010898a333e5d9b97151d285ea376de799e
Jim Miller [Fri, 7 Nov 2014 02:40:15 +0000 (18:40 -0800)]
Change Configure structure to List<PersistableBundle>
Adding the new structure was making it difficult for
LMP devices to have common source with upcoming API version.
Fixes bug
17008504
Change-Id: I704503cf0ebff113874c87ab11e37735dbe7b8d7
Andreas Gampe [Sat, 8 Nov 2014 01:14:58 +0000 (01:14 +0000)]
Merge "Frameworks/base: Wall Werror in libs/storage"
Andreas Gampe [Sat, 8 Nov 2014 01:10:49 +0000 (01:10 +0000)]
Merge "Frameworks/base: Fix two warnings in cmds"
Andreas Gampe [Sat, 8 Nov 2014 00:28:19 +0000 (16:28 -0800)]
Frameworks/base: Fix two warnings in cmds
Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
Jeff Sharkey [Sat, 8 Nov 2014 00:24:48 +0000 (16:24 -0800)]
Resurrect dusty PackageManagerTests.
Mostly just getting them running again, still a few failures related
to native library symlinks that need more investigation.
Bug:
18048725
Change-Id: I4642adab9fb2b9ec1488b700edcee48c09e36005
Stuart Scott [Sat, 8 Nov 2014 00:21:06 +0000 (00:21 +0000)]
am
0e58219f: am
90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev
* commit '
0e58219f7fbb3f39af109e0fa6c7ed8c47ee9f3b':
SubInfoRecord provides a tinted icon with the initial embossed.
Stuart Scott [Sat, 8 Nov 2014 00:15:51 +0000 (00:15 +0000)]
am
90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev
* commit '
90cf41c35f5a4c82cd1e992498bcd9b30ad92446':
SubInfoRecord provides a tinted icon with the initial embossed.
Stuart Scott [Sat, 8 Nov 2014 00:09:15 +0000 (00:09 +0000)]
Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev
Stuart Scott [Tue, 28 Oct 2014 16:29:01 +0000 (09:29 -0700)]
SubInfoRecord provides a tinted icon with the initial embossed.
bug:
17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
Amith Yamasani [Fri, 7 Nov 2014 23:34:04 +0000 (15:34 -0800)]
Inform PendingIntent sender if broadcast was not queued.
If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.
This is a potential fix for:
Bug:
18290018
Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
Andreas Gampe [Fri, 7 Nov 2014 23:15:28 +0000 (23:15 +0000)]
Merge "resolved conflicts for merge of
487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Andreas Gampe [Fri, 7 Nov 2014 23:03:46 +0000 (15:03 -0800)]
resolved conflicts for merge of
487ae9b8 to lmp-mr1-dev-plus-aosp
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
Jeff Sharkey [Fri, 7 Nov 2014 23:13:41 +0000 (23:13 +0000)]
am
f13fe148: am
001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev
* commit '
f13fe14853ca13830e2bf293f3a24a965570b507':
ProcessCpuTracker touching proc is fine.
Christopher Tate [Fri, 7 Nov 2014 23:08:49 +0000 (23:08 +0000)]
am
e5205d1a: am
48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
* commit '
e5205d1ae491a97197d12fc2bc5afe1a449cf75d':
Enable runtime turndown of backup/restore services
Jeff Sharkey [Fri, 7 Nov 2014 23:08:07 +0000 (23:08 +0000)]
am
001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev
* commit '
001b2e93030b06774e6af304157637c1acb94226':
ProcessCpuTracker touching proc is fine.
Christopher Tate [Fri, 7 Nov 2014 23:03:21 +0000 (23:03 +0000)]
am
48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
* commit '
48a7c3b522625ffbecb0cce7b95be6d41631577b':
Enable runtime turndown of backup/restore services
Jeff Sharkey [Fri, 7 Nov 2014 23:03:10 +0000 (23:03 +0000)]
Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev
Christopher Tate [Fri, 7 Nov 2014 23:00:22 +0000 (23:00 +0000)]
Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
Adam Powell [Fri, 7 Nov 2014 22:51:16 +0000 (14:51 -0800)]
Don't register more receivers and observers for every DateTimeView
SystemUI uses several of these per notification, so be a little more
conservative and track individual views to update per process instead.
Bug
16902706
Change-Id: Ib77a8e7727d027cae39d5e6f431cac1d1ff8a121
John Reck [Fri, 7 Nov 2014 22:55:32 +0000 (22:55 +0000)]
am
8dda03a0: am
ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
* commit '
8dda03a08603f45b3c2c90633491ce2c1fea266b':
Have an actual fallback if the surface is lost
Jeff Sharkey [Fri, 7 Nov 2014 22:54:55 +0000 (14:54 -0800)]
ProcessCpuTracker touching proc is fine.
Otherwise we spew hundreds of StrictMode violations.
Bug:
18261125
Change-Id: I2e5ff697b99f55bb73e806f04dba8384e6f1b935
Andreas Gampe [Fri, 7 Nov 2014 22:49:44 +0000 (22:49 +0000)]
am
e80c01e8: Merge "Frameworks/base: Turn on -Wall -Werror in cmds"
* commit '
e80c01e8d124c69ca60fc8e7a0ca7001be3796e0':
Frameworks/base: Turn on -Wall -Werror in cmds
John Reck [Fri, 7 Nov 2014 22:45:33 +0000 (22:45 +0000)]
am
ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
* commit '
ca93f69c96df85bd6bc72a2a47dae6c0d5336ab2':
Have an actual fallback if the surface is lost
John Reck [Fri, 7 Nov 2014 22:40:57 +0000 (22:40 +0000)]
Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
Sander Alewijnse [Fri, 7 Nov 2014 22:35:51 +0000 (22:35 +0000)]
am
8c1cd7e6: am
3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
* commit '
8c1cd7e61f050afd450cb05add633e2fbe0b195a':
Added the restrictions pending application restrictions key.
Andreas Gampe [Fri, 7 Nov 2014 22:35:42 +0000 (22:35 +0000)]
Merge "Frameworks/base: Wall Werror in libs/androidfw"
Andreas Gampe [Fri, 7 Nov 2014 22:35:32 +0000 (22:35 +0000)]
Merge "Frameworks/base: Turn on -Wall -Werror in cmds"
Andreas Gampe [Wed, 1 Oct 2014 04:48:18 +0000 (21:48 -0700)]
Frameworks/base: Turn on -Wall -Werror in cmds
Fix small warnings, turn on -Wall -Werror.
Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
Sander Alewijnse [Fri, 7 Nov 2014 22:30:50 +0000 (22:30 +0000)]
am
3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
* commit '
3eed90f39301089a1c16d6e2c0d027b187567cf0':
Added the restrictions pending application restrictions key.
Sander Alewijnse [Fri, 7 Nov 2014 22:24:58 +0000 (22:24 +0000)]
Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
Alan Viverette [Fri, 7 Nov 2014 22:20:09 +0000 (22:20 +0000)]
am
c30a7623: am
48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev
* commit '
c30a7623a2f97ce791ed019d7014b842f9c9b7d2':
Support theme attributes in StateListDrawable <item> element
Sander Alewijnse [Fri, 7 Nov 2014 21:43:00 +0000 (21:43 +0000)]
Added the restrictions pending application restrictions key.
Bug:
17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
Alan Viverette [Fri, 7 Nov 2014 22:14:45 +0000 (22:14 +0000)]
am
48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev
* commit '
48c8cd06aa0b284368d836cf5d2e6c1b1630d322':
Support theme attributes in StateListDrawable <item> element
Alan Viverette [Fri, 7 Nov 2014 22:09:42 +0000 (22:09 +0000)]
Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev
John Reck [Fri, 7 Nov 2014 22:01:02 +0000 (22:01 +0000)]
am
413a6812: am
4734b67d: am
050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue
* commit '
413a68127a7dd1c422e142cbd0e9157c99623de3':
DO NOT MERGE Fix finalizer ordering/double-free issue
Jason Monk [Fri, 7 Nov 2014 21:55:37 +0000 (21:55 +0000)]
am
e2038151: am
872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev
* commit '
e2038151c2a3410a67edc408a1d677b05cda41ec':
Prepare for testing the NetworkControllerImpl
John Reck [Fri, 7 Nov 2014 21:52:08 +0000 (21:52 +0000)]
am
4734b67d: am
050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue
* commit '
4734b67dc56950f93da385d3d59b06b0058cf33b':
DO NOT MERGE Fix finalizer ordering/double-free issue
John Reck [Fri, 7 Nov 2014 21:47:42 +0000 (21:47 +0000)]
am
050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue
* commit '
050a8a050de04bd0098cde8fdf665a7202929ee0':
DO NOT MERGE Fix finalizer ordering/double-free issue
Andreas Gampe [Wed, 22 Oct 2014 06:04:54 +0000 (23:04 -0700)]
Frameworks/base: Wall Werror in libs/androidfw
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.
Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
John Reck [Fri, 7 Nov 2014 18:33:36 +0000 (10:33 -0800)]
DO NOT MERGE Fix finalizer ordering/double-free issue
Bug:
18289984
If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer
Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit
c298f9c9170b9e8721cfb616f784ec22734f22f4)
Jason Monk [Fri, 7 Nov 2014 21:29:45 +0000 (21:29 +0000)]
am
872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev
* commit '
872d4e00ed1715d76dc8e97853a4e3e9542ca8d0':
Prepare for testing the NetworkControllerImpl
Jason Monk [Fri, 7 Nov 2014 21:26:38 +0000 (21:26 +0000)]
Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev
Tyler Gunn [Fri, 7 Nov 2014 21:14:25 +0000 (21:14 +0000)]
am
3f5a43b2: Merge "Conference event package performance improvement." into lmp-mr1-dev automerge:
af7dfdd
* commit '
3f5a43b2d3e7b233cda4d6d15cf014689862cf21':
Conference event package performance improvement.
John Spurlock [Fri, 7 Nov 2014 21:14:19 +0000 (21:14 +0000)]
am
d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge:
5cde5c6
* commit '
d8367c24f76f0464701228fafe630f8abfbc91da':
QS: Long-press on usage-based tiles to hide.
John Spurlock [Fri, 7 Nov 2014 21:14:13 +0000 (21:14 +0000)]
am
1e64aa33: Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev automerge:
e586ab7
* commit '
1e64aa3382f6d25a6ac2231f861c25ecca328285':
Reset rotation-lock-for-accessibility setting on upgrade.
Tyler Gunn [Fri, 7 Nov 2014 20:57:36 +0000 (20:57 +0000)]
Merge "Conference event package performance improvement." into lmp-mr1-dev
automerge:
af7dfdd
* commit '
af7dfddaade234bdad889eee4fcba7ba181031cb':
Conference event package performance improvement.
John Spurlock [Fri, 7 Nov 2014 20:56:35 +0000 (20:56 +0000)]
Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev
automerge:
5cde5c6
* commit '
5cde5c616a39b060730f9b995c19642695222975':
QS: Long-press on usage-based tiles to hide.
John Spurlock [Fri, 7 Nov 2014 20:55:24 +0000 (20:55 +0000)]
Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev
automerge:
e586ab7
* commit '
e586ab79670b6fabfa80f1f29ecb184f97f06f72':
Reset rotation-lock-for-accessibility setting on upgrade.
Tyler Gunn [Fri, 7 Nov 2014 20:42:20 +0000 (20:42 +0000)]
Merge "Conference event package performance improvement." into lmp-mr1-dev
John Spurlock [Fri, 7 Nov 2014 20:31:10 +0000 (20:31 +0000)]
Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev
John Spurlock [Fri, 7 Nov 2014 04:06:25 +0000 (23:06 -0500)]
QS: Long-press on usage-based tiles to hide.
Bug:
18284167
Change-Id: Ia03ea34af5733b801be6a14645c76754b73c6165
John Spurlock [Fri, 7 Nov 2014 20:26:34 +0000 (20:26 +0000)]
Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev
John Spurlock [Fri, 7 Nov 2014 20:14:21 +0000 (15:14 -0500)]
Reset rotation-lock-for-accessibility setting on upgrade.
Since it now hides the display setting, force the user to opt-in
again.
Bug:
18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307