16010 Commits

Author SHA1 Message Date
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
b851c89d22 Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
2014-05-20 14:09:12 +01: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
deda5467f4 am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit 'a4fd1baac68dcd73957e0fca0c02089ecf9a268a':
  Fail if we're unable to agree on an ISA for shared UIDs.
2014-05-19 13:29:57 +00:00
Narayan Kamath
a4fd1baac6 Merge "Fail if we're unable to agree on an ISA for shared UIDs." 2014-05-19 13:26:44 +00:00
Narayan Kamath
20ee78ab95 Fail if we're unable to agree on an ISA for shared UIDs.
It's not worth the complexity of rescanning the APK and
extracting a shared library with a different ABI.

Also gets rid of an unnecessary command line argument and
checks for dex-opt failures while adjusting shared ABIs.

bug: 14453227

Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
2014-05-19 14:24:46 +01:00
Narayan Kamath
2c12587620 am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
  Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:09 +00:00
Narayan Kamath
844a4c81ff Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.

(cherry-picked from commit bc6001b026069714177526eb1120b0011d6f2a51)

Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
2014-05-16 12:55:48 +01:00
Narayan Kamath
8dcfefd652 Support an ABI flag for instrumentation.
Allows us to choose what ABI a process uses when
launching it with "adb shell am instrument", for eg.

adb shell am instrument --abi arm64-v8a component/runner

Note that we only perform very basic validation of the
ABI. In general, there is no guarantee that the app will
launch with the instruction set we choose, for eg. if it
has native libraries that are for a different ABI.

bug: 14453227

Change-Id: Ifb7e89b53675080dc87941091ee5ac360f218d7f
2014-05-16 10:30:00 +01: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
Narayan Kamath
6e2e686889 am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
  Remove "required" prefix from ABI fields.
2014-05-15 12:41:47 +00:00
Narayan Kamath
6e35a2ad05 Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.

(cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047)

Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
2014-05-15 10:57:05 +01: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
Brian Carlstrom
2ce02bba1e am b7d7cbc9: Merge "Fix background PackageUsage writing."
* commit 'b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a':
  Fix background PackageUsage writing.
2014-05-13 00:34:42 +00:00
Brian Carlstrom
112a720638 Fix background PackageUsage writing.
Change-Id: Ia358b61e648b427c86cf75ae096cd2a68ace209f
2014-05-12 16:56:34 -07: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
edc31509c2 am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
* commit 'b98ca5b0dd73f374178022b4a4b37412f01a3c03':
  If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:33:04 +00:00
Brian Carlstrom
7c5c864c8a If PackageUsage information is missing, treat as first boot and compile everything
Bug: 14663243
Change-Id: I0ae33882044211f777590f482e17e87596be4463
2014-05-09 09:52:09 -07: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
Brian Carlstrom
691079ddc0 am a21ba5be: Merge "Add BackgroundDexOptService"
* commit 'a21ba5bec748e2f10d7e6d38181ec1124991cb60':
  Add BackgroundDexOptService
2014-05-07 03:33:41 +00:00
Brian Carlstrom
f2db00fdcd am edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"
* commit 'edb88bcd232176e575f2dbee2cfdb1bfbe33faef':
  Use package usage information to decide what dex files to optimize in PackageManagerService
2014-05-07 03:33:37 +00: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
Brian Carlstrom
7395a8ab8a Add BackgroundDexOptService
Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
2014-05-06 15:14:29 -07:00
Brian Carlstrom
ff1ec4d9e7 Use package usage information to decide what dex files to optimize in PackageManagerService
Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
2014-05-06 15:06:25 -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
Brian Carlstrom
e3cceef7ec am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
  Minor cleanup of UsageStatsService
2014-05-01 21:41:58 +00:00
Brian Carlstrom
393fbe71f8 Minor cleanup of UsageStatsService
Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
2014-05-01 14:12:14 -07: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
5dca099df7 am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '1cec7f8539e6465ff80577169d7d07df3c2574b7':
  Don't adjust ABI if PackageSetting#pkg is null.
2014-05-01 14:00:52 +00:00
Narayan Kamath
c1f81f9086 am 27f2bfc4: Merge "Fix dex file pruning logic."
* commit '27f2bfc406157039c5241f6a4f38f597b2076e2a':
  Fix dex file pruning logic.
2014-05-01 14:00:49 +00:00