Commit Graph

56005 Commits

Author SHA1 Message Date
Adam Lesinski
112c1dc63a am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:58:50 +00:00
Andreas Gampe
5d7b68d491 am 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit '53ed452e86aa186b5903b65057b4473629292f0d':
  Frameworks/base: Propagate boot status to installd
2015-09-22 18:54:19 +00:00
Adam Lesinski
6a8d1fd62f am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit 'dbca76cda1a2a6fa95c592654f8649cb30b65833':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:50:56 +00:00
Andreas Gampe
53ed452e86 am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit '9ce68b24440a7bc326cad2d09940ccf750eb2b2a':
  Frameworks/base: Propagate boot status to installd
2015-09-22 18:44:47 +00:00
Adam Lesinski
dbca76cda1 am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:42:33 +00:00
Andreas Gampe
9ce68b2444 am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a':
  Frameworks/base: Propagate boot status to installd
2015-09-22 18:36:43 +00:00
Adam Lesinski
1b57758a1b Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev 2015-09-22 18:33:14 +00:00
Elliott Hughes
776fa57b2d am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit 'aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
  WrapperInit: remove dead execStandalone method
2015-09-22 15:50:09 +00:00
Elliott Hughes
aa31169804 am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
  WrapperInit: remove dead execStandalone method
2015-09-22 15:42:36 +00:00
Todd Kennedy
d65fc9c460 am d8b47855: save "retain loader" state DO NOT MERGE
* commit 'd8b47855a316700751f7daead0b180005853be33':
  save "retain loader" state DO NOT MERGE
2015-09-22 07:27:18 +00:00
Todd Kennedy
d8b47855a3 save "retain loader" state DO NOT MERGE
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit c5ac16f531)
2015-09-22 07:19:14 +00:00
Adam Lesinski
52290c9c4f Fix Array Index Out of Bounds in BatteryStatsImpl
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
2015-09-21 17:38:52 -07:00
Andreas Gampe
06bb908b78 Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-21 15:16:13 -07:00
Daniel Micay
13eac10a26 WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a.

Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
2015-09-21 18:14:56 -04:00
Erik Kline
5bcd4477dd am 2a068606: am c89f3a48: am 7aa79efe: Grab a wakelock while doing ARP/ND probing
* commit '2a06860609254ab07ac7c866d8a7435a4245a9f0':
  Grab a wakelock while doing ARP/ND probing
2015-09-21 12:15:39 +00:00
Erik Kline
c89f3a4833 am 7aa79efe: Grab a wakelock while doing ARP/ND probing
* commit '7aa79efe80b790eef61ac355c0ce6c7b606e6f78':
  Grab a wakelock while doing ARP/ND probing
2015-09-21 12:00:25 +00:00
Erik Kline
7aa79efe80 Grab a wakelock while doing ARP/ND probing
Bug: 23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56
2015-09-21 14:59:05 +09:00
Justin Harrison
46db0f2215 am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '08b004233537f625044b3f01e2923b600a9aa77c':
  Add support for setting color transforms
2015-09-19 00:46:19 +00:00
Justin Harrison
1f46395702 am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
  Add support for setting color transforms
2015-09-19 00:29:40 +00:00
Adam Lesinski
eb1356cc15 am 3bdbda78: am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit '3bdbda780613e1701e4e3e567be8a743a8dedb8f':
  Fix crash when no power_profile is specified
2015-09-19 00:23:02 +00:00
Justin Harrison
91f2123b2a Merge "Add support for setting color transforms" into mnc-dr-dev 2015-09-19 00:21:41 +00:00
Michael Wright
58e829f71d Add support for setting color transforms
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
2015-09-18 23:37:28 +00:00
Adam Lesinski
dd0238ec7d am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a':
  Fix crash when no power_profile is specified
2015-09-18 22:21:31 +00:00
Adam Lesinski
e54253bdd3 Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 2015-09-18 22:15:19 +00:00
Christine Hallstrom
c4f196b661 am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev
* commit '039fd00fd2b499a871be8551d80d299120ff5595':
  Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
2015-09-18 22:06:38 +00:00
Adam Lesinski
8057133d49 Fix crash when no power_profile is specified
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
2015-09-18 14:56:34 -07:00
Christine Hallstrom
13c23df90c Merge "Manual 'cherry pick' to fix CTS tests for MediaControllerTest." into cw-e-dev 2015-09-18 21:29:09 +00:00
Christine Hallstrom
2eb7d4761e Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.

The original reverted change can be found at ag/723643.

Bug: 24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc
2015-09-18 21:27:38 +00:00
Adam Lesinski
4092eeb7f7 am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
  BatteryStats: Better big-little CPU accounting
2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Alan Viverette
c602c57737 am 48c7e6f3: am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '48c7e6f3dc0462f43657b6003e4ba4021b0544ed':
  prevent unnecessary warning logs caused by View.toString()
2015-09-18 20:19:27 +00:00
Alan Viverette
48c7e6f3dc am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '24ff6823c411f794aceaae89b0b029fbf8ef6b29':
  prevent unnecessary warning logs caused by View.toString()
2015-09-18 20:11:44 +00:00
Alan Viverette
24ff6823c4 Merge "prevent unnecessary warning logs caused by View.toString()" 2015-09-18 19:59:20 +00:00
Adam Powell
9546d5a2ec am 96c95ba5: am 5f22c0b2: am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '96c95ba59658708c3214b93ace4bb2835ac62863':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 16:52:21 +00:00
Adam Powell
5f22c0b27a am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '1b67a6b84d133e1fdac352d0821034ceca739a71':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 16:33:57 +00:00
kenzyun_chen
90ebb99b36 prevent unnecessary warning logs caused by View.toString()
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.

The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100

Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
2015-09-18 18:30:30 +08:00
Adam Powell
00f4aad704 Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.

Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.

In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.

Bug 24113937

Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
2015-09-17 20:56:00 +00:00
Tim Murray
0816319a29 am 4816ea0e: am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
* commit '4816ea0e120fd4e2892d372f33c8ca21e4b2efb6':
  Send power hint on fling gestures.
2015-09-17 02:51:39 +00:00
Tim Murray
a02f98239e am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
* commit '952d5b334ccdf9cab0f56673861906e59d4e9933':
  Send power hint on fling gestures.
2015-09-17 02:33:35 +00:00
Tim Murray
952d5b334c Merge "Send power hint on fling gestures." into mnc-dr-dev 2015-09-17 02:24:32 +00:00
Michael Wright
a4d22d718a Send power hint on fling gestures.
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.

bug 24059298

Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
2015-09-17 00:18:13 +00:00
Adam Powell
4e6e12c88e am 1ac37924: am 4873c549: am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
* commit '1ac3792491743ead048e0a85a5656cf33956da64':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
2015-09-16 21:20:04 +00:00
Fyodor Kupolov
fd464a301f am 71b4b738: am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit '71b4b738a611565659df33fe56635d75a25e6f19':
  Use app directory as apkPath for cluster installs
2015-09-16 21:19:57 +00:00
Adam Powell
4873c549f7 am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
* commit '39e94ebe22d4959facea4c3621a0a5377242a570':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
2015-09-16 21:02:58 +00:00
Fyodor Kupolov
d20f210650 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs
2015-09-16 21:02:53 +00:00
Adam Powell
39e94ebe22 Handle single-choice ChooserActivities and bound ChooserTargetServices
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.

Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.

Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.

Bug 23152483

Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit 9761ab2a64)
2015-09-16 19:54:24 +00:00
Fyodor Kupolov
bfc584df68 Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 2015-09-16 19:37:47 +00:00
Chris Tate
9bf4d76579 am e46bf3f7: am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit 'e46bf3f7f25610a8839542af44eecbaf961892f6':
  Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:25:06 +00:00
Chris Tate
ee16be69f1 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
  Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:11:19 +00:00