Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,708 Commits 3 Branches 0 Tags
c3fc91237498dce32300a60ed2febf8296ae99ef
Commit Graph

54853 Commits

Author SHA1 Message Date
Adam Lesinski
a57a540440 Fix asymmetry in parceling/unparceling code for BatteryStats summary 
Bug:24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
 2015-09-28 10:59:45 -07:00
Adam Lesinski
d913782f1b am d5f10154: Bump BatteryStats version 
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
  Bump BatteryStats version
 2015-09-28 07:00:52 +00:00
Adam Lesinski
d5f10154c7 Bump BatteryStats version 
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
 2015-09-27 21:28:43 +00:00
Bryce Lee
f0740e0a2e Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 2015-09-26 01:33:00 +00:00
Bryce Lee
bc58f59da6 Add ThermalObserver system service to capture thermal state uevents. 
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
 2015-09-25 16:43:01 -07:00
Ned Burns
1b69fcbf81 am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed
 2015-09-25 21:10:09 +00:00
Gus Prevas
b17d1e5e6a Merge "Adds an option to override RemoteViews transition." into cw-e-dev 2015-09-25 17:17:44 +00:00
Gus Prevas
1ed322b123 Adds an option to override RemoteViews transition. 
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches.  If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.

Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
 2015-09-25 13:10:52 -04:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
 2015-09-25 01:30:43 +00:00
Dianne Hackborn
e7a3435c91 Docs only change: update build version docs. 
Change-Id: I30f55549394693ea04cd390b1ae66347ae212123
 2015-09-24 17:32:26 -07:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -07:00
Ned Burns
f4e1d10cd3 Kill ActivityView's background thread when it's destroyed 
We were leaking background threads for every new ActivityView.

Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38
 2015-09-23 20:19:16 -04:00
Todd Kennedy
898e6973ca am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev 
* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state
 2015-09-23 18:05:58 +00:00
Todd Kennedy
739bb7c694 Merge "save "retain loader" state" into mnc-dr-dev 2015-09-23 17:56:52 +00:00
Paul Jensen
5ebe8e26f2 am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:33:18 +00:00
Paul Jensen
554cecea4c am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:33:13 +00:00
Paul Jensen
4cbfe3316f am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:21:27 +00:00
Paul Jensen
10a7d7449d am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:21:22 +00:00
Paul Jensen
773d71e7c4 am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5 am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 11:06:32 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:06:27 +00:00
Paul Jensen
ece4ac2105 Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev 2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314 Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 2015-09-23 10:58:57 +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
Todd Kennedy
e16fb554dd save "retain loader" state 
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
 2015-09-22 10:16:42 -07: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
Zach Jang
0cae838166 am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:06:58 +00:00
Zach Jang
b5173241d1 am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:46 +00:00
Zach Jang
e54c195a53 am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:18 +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
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
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
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
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
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
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
Zach Jang
fe4cbf2b1b am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26 am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:09:55 +00:00
Zach Jang
0a8197b1e4 am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:04:23 +00:00