Nick Kralevich
532536f145
am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."
...
* commit 'daa0ee137d43850c834b1ead3f871ceaa49814a7':
SELinuxMMAC additions to perform policy versioning checks.
2014-05-31 08:51:05 +00:00
Nick Kralevich
332f35813e
am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."
...
* commit '89b88f226928e269e84100154bc78c0f8dc2016e':
Allow SELinuxPolicyInstallReceiver to update new policy files.
2014-05-31 08:49:50 +00:00
Narayan Kamath
f7871c3146
am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."
...
* commit 'b9b31f4b8eda123e7b544d1a0fa886576064adca':
Support an ABI flag for instrumentation.
2014-05-30 10:49:00 +00:00
Jeff Brown
92ab0b91cd
am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev
...
* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
Add dumpsys to dock observer.
2014-05-30 01:01:17 +00:00
Jeff Brown
010e561a70
Add dumpsys to dock observer.
...
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.
eg. View current state.
adb shell dumpsys DockObserver
eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1
eg. Reset back to normal.
adb shell dumpsys DockObserver reset
Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
2014-05-29 17:48:33 -07:00
Craig Mautner
754a8c4c95
am 1b4bf857: Do not start tasks on ActivityViews unless explicit
...
* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
Do not start tasks on ActivityViews unless explicit
2014-05-27 16:22:39 +00:00
Craig Mautner
1b4bf857d3
Do not start tasks on ActivityViews unless explicit
...
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.
Fixes bug 15162447.
Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
2014-05-27 09:19:28 -07:00
Dmitriy Ivanov
190ed5db4a
am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"
...
* commit '2137d6a843b82996e08f0e03376e48860919d8bc':
Increase start timeout for wrapped process
2014-05-23 02:40:42 +00:00
narayan
82ec8c58b1
am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
...
* commit 'ab3d85ab1a0ae58add5df6efc30607624475405b':
Fix NPE in PackageManagerService.
2014-05-21 20:22:03 +00:00
Dan Sandler
d0ec843882
am 7509733c: Elide extras strings from noman dumpsys output.
...
* commit '7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
Elide extras strings from noman dumpsys output.
2014-05-21 16:26:29 +00:00
Dan Sandler
7509733c8d
Elide extras strings from noman dumpsys output.
...
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit 44de3cfc08428378b93172a2b03f9785a3638678)
2014-05-21 15:57:10 +00:00
Jeff Brown
77669abb83
am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
...
* commit '9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
Defer display ready until brightness ramp completes.
2014-05-21 08:40:36 +00:00
Jeff Brown
fcc4fed3c1
am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
...
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
2014-05-21 08:40:33 +00:00
Brian Carlstrom
1d26571695
am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."
...
* commit 'e77a77d081ff9d05100702f5880f356da27fd087':
Improve ABI handling for shared user ids.
2014-05-21 08:27:03 +00:00
Jeff Brown
4255869ac0
Defer display ready until brightness ramp completes.
...
Bug: 14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
2014-05-20 22:02:46 -07:00
Jeff Brown
6d8fd27e51
Make power button behavior configurable.
...
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.
Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
2014-05-20 21:24:38 -07:00
Jeff Brown
ccf51bef28
am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
...
* commit '2d9b513dab78242281bca125b4abc6b8235089a6':
I'm feeling the good vibrations.
2014-05-21 02:38:11 +00:00
Jeff Brown
8f120dd6d6
am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
...
* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
Allow display timeouts to be set in config.xml.
2014-05-21 02:38:07 +00:00
Jeff Brown
969579bb9d
I'm feeling the good vibrations.
...
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution. However if
the system is performing haptic feedback then we want to allow
it to run to completion.
Bug: 14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
2014-05-20 19:29:29 -07:00
Jeff Brown
27736f5c0a
Allow display timeouts to be set in config.xml.
...
Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
2014-05-20 17:17:10 -07:00
Narayan Kamath
9672ee125d
am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
...
* commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99':
Fail if we're unable to agree on an ISA for shared UIDs.
2014-05-19 13:33:19 +00:00
Narayan Kamath
5d5f19a339
am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
...
* commit '6e2e686889037711170ee145f9dfdb442cee85db':
Remove "required" prefix from ABI fields.
2014-05-15 12:45:27 +00:00
Brian Carlstrom
f230061b38
am 2ce02bba: am b7d7cbc9: Merge "Fix background PackageUsage writing."
...
* commit '2ce02bba1eea682282408b8521dad8c91837fbab':
Fix background PackageUsage writing.
2014-05-13 00:40:12 +00:00
Simon Wilson
728614e42e
am c5df4d0e: Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" into klp-modular-dev
...
* commit 'c5df4d0e7d43d39072dfbab5f37d8b170de4617b':
BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
2014-05-12 19:49:00 +00:00
Colin Cross
aa943d1b2d
BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
...
Instead of requiring the kernel to join last_kmsg and the reboot
reason together, allow both to be passed to userspace and have
userspace combine them the way the log parsers want them.
Existing devices with no ro.boot.bootreason property and kernel
support for putting the reason in last_kmsg will continue to
use the kernel's formatting.
Bug: 13813279
Change-Id: I079b0107feb1533c6a54044ca6a114741127dfbc
(cherry picked from commit 431614cb6b2170fc715757dc6f964fdbb140ee7d)
2014-05-09 22:30:23 +00:00
Brian Carlstrom
09d1189668
am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit 'edc31509c2ff8cba86f30c836934d32a3e249dec':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:38:10 +00:00
Brian Carlstrom
0b5598c924
am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService"
...
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
Add BackgroundDexOptService
2014-05-07 20:28:25 +00:00
Brian Carlstrom
3bbef521d4
resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp
...
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
2014-05-07 13:20:23 -07:00
Heather Lee Wilson
6827949fc6
am d237cbac: Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev
...
* commit 'd237cbac122cdb48e5b73db5a9c5f8d85ceebe55':
Prevent crashing when disabling MCU during dream wakeup
2014-05-07 00:31:36 +00:00
Heather Lee Wilson
9da8301e0a
Prevent crashing when disabling MCU during dream wakeup
...
AmbientMode attempting to send message to DozeHardware no longer results in an
uncaught IllegalStateException. The exception was crashing Android Wear when
DozeHardware had already been released by PowerManagementService at time of
AmbientMode's message.
Change-Id: I5956a453802b5b764e88638f6b6d899cbc94cc8d
2014-05-06 15:31:57 -07:00
Jeff Brown
a93369a819
am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
...
* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
2014-05-06 20:30:49 +00:00
Jeff Brown
84aaf124b7
Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
2014-05-06 20:27:34 +00:00
Jeff Brown
01ee6f6cf7
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
...
Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.
Removed noteInputEvent() since it is unused.
Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:18:19 -07:00
Craig Mautner
9bb4df3a7d
am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
...
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
Pause and resume ActivityView when visibility changes
2014-05-05 21:03:39 +00:00
Craig Mautner
6dffeb9eeb
am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev
...
* commit '8890013ae0473663a6b9591db6230e9038ba6711':
Add null check to embeddedAllowed check
2014-05-05 20:59:37 +00:00
Craig Mautner
e88097bd00
Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
2014-05-05 20:58:15 +00:00
Craig Mautner
05678d5a31
Add null check to embeddedAllowed check
...
If the component being checked has been removed an NPE will be
thrown. This checks for that situation and handles it.
Fixes bug 14562234.
Change-Id: Ica5713378f356ac8441862d455b7d284ea111212
2014-05-05 12:32:40 -07:00
Craig Mautner
d13a558397
Pause and resume ActivityView when visibility changes
...
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.
Fixes bug 14034658.
Change-Id: Icab43678053c225db70f051dceacd4d024df2153
2014-05-05 12:07:40 -07:00
Jeff Brown
4f8cd18880
am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev
...
* commit '7f6ab17d414726868563105cd995b37dd519320b':
Clean up some terminology related to interactive state.
2014-05-01 23:29:13 +00:00
Jeff Brown
140ffc783c
Clean up some terminology related to interactive state.
...
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Brian Carlstrom
2de2e22540
am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
...
* commit 'e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c':
Minor cleanup of UsageStatsService
2014-05-01 21:45:38 +00:00
Narayan Kamath
531381056f
am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
...
* commit '5dca099df7100c531e111b50435605c318f1e6d4':
Don't adjust ABI if PackageSetting#pkg is null.
2014-05-01 14:39:20 +00:00
Narayan Kamath
d6809b35af
am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."
...
* commit 'c1f81f9086037dde6e082b8a80c84277cb727726':
Fix dex file pruning logic.
2014-05-01 14:39:16 +00:00
Narayan Kamath
fbd80b58db
am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."
...
* commit '51f4367cac606580a5ca10ec1cf2dcab3982aebc':
Adjust instruction sets for shared UID apps.
2014-05-01 14:39:12 +00:00
Narayan Kamath
3a951e52d9
resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp
...
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
2014-05-01 15:32:20 +01:00
Narayan Kamath
d2ec8724d2
am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."
...
* commit 'd85ded890d86d454a0571c63911ff911633e3a95':
Fix OEM native library path bug.
2014-05-01 14:01:14 +00:00
Narayan Kamath
f5c6a1b3eb
am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"
...
* commit 'eb5734989b3ef5455359f8807684a860ad04c134':
Fix native-lib dir assignment & updating
2014-05-01 14:01:10 +00:00
Narayan Kamath
0338af46f9
am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
...
* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
Handle /oem and /vendor as well
2014-05-01 13:57:21 +00:00
Narayan Kamath
5bc12a1b5d
am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"
...
* commit 'a7b465efc4eede46b8dfc8932c6c30346e8e79de':
Support per-package lib dirs for bundled apps
2014-05-01 13:57:17 +00:00
Jinsuk Kim
6003730220
am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
...
* commit '8fe27e881851921a90882f7d4da142bf936c5549':
Move logical address allocation logic into native service from HAL
2014-04-29 21:35:01 +00:00