drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,590 Commits 1 Branch 0 Tags
Commit Graph

292 Commits

Author SHA1 Message Date
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
Jinsuk Kim
8fe27e8818 Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev 2014-04-29 21:32:50 +00:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
 2014-04-25 18:45:06 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed. 
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
 2014-04-25 11:20:01 -07:00
Craig Mautner
e5889679f6 am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
 2014-04-25 03:06:34 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon. 
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
 2014-04-25 03:01:40 +00:00
Craig Mautner
fbb0796eb3 am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:42:25 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Michael Kolb
0fc5f86950 am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
  Use rotation to position circular display mask
 2014-04-24 16:13:41 +00:00
Michael Kolb
e597d5f931 Merge "Use rotation to position circular display mask" into klp-modular-dev 2014-04-24 16:08:21 +00:00
Michael Kolb
8b275ca9d3 Use rotation to position circular display mask 
Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
 2014-04-24 09:01:19 -07:00
Craig Mautner
75731016e9 Add test for attribute android:allowEmbedded 
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
 2014-04-24 08:42:32 -07:00
Craig Mautner
7e28afd956 am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '7d2d2272f1dc91f27983797349f8253bfa25e8b4':
  Force ActivityView activities to start in new task
 2014-04-24 09:11:30 +00:00
Craig Mautner
7f7bdb2712 Force ActivityView activities to start in new task 
Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.

Fixes bug 14252286.

Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e
 2014-04-23 13:55:36 -07:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
 2014-04-23 16:48:34 +00:00
Jeff Brown
62271b9522 am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 
* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
  Fix HDMI hotplug display blanking behavior.
 2014-04-23 01:22:26 +00:00
Jeff Brown
3af3926749 Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 2014-04-23 01:20:01 +00:00
Jeff Brown
44b1f76474 Fix HDMI hotplug display blanking behavior. 
Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
 2014-04-22 18:07:24 -07:00
Ying Wang
d12bf27575 am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev 
* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
 2014-04-23 00:11:52 +00:00
Ying Wang
b081a59a0f Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name 
It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
 2014-04-22 15:20:16 -07:00
Nick Kralevich
9a492393df am 5246f459: am d267c1a0: Merge "remove unneeded import statements." 
* commit '5246f4599a0c9978012ffb1049307704b5027a0b':
  remove unneeded import statements.
 2014-04-22 21:15:10 +00:00
Nick Kralevich
d236d625b4 am 3ab7882a: am a67d4a6e: Merge "remove unused import." 
* commit '3ab7882a57d3c7a0e13f58837cd02138df43f301':
  remove unused import.
 2014-04-22 21:14:59 +00:00
Craig Mautner
43c6a98f0f am 6985badc: Fix black ActivityView 
* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView
 2014-04-22 13:27:53 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle 
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
 2014-04-22 13:27:44 +00:00