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

76087 Commits

Author SHA1 Message Date
Adam Lesinski
983c6d4d39 am b8126531: am d913782f: am d5f10154: Bump BatteryStats version 
* commit 'b8126531c4275b5caf0132930a2cfc14344c20ce':
  Bump BatteryStats version
 2015-09-28 07:12:49 +00:00
Adam Lesinski
b8126531c4 am d913782f: am d5f10154: Bump BatteryStats version 
* commit 'd913782f1b48e1ef5928f869279c541e023d1cb7':
  Bump BatteryStats version
 2015-09-28 07:06:55 +00: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
Baligh Uddin
63d93ba58a Import translations. DO NOT MERGE 
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
 2015-09-26 12:34:51 -07:00
Bryce Lee
979a22eaf9 am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 
* commit '6ad696c35b80f70f19de304b53bdbfc6f5a265d8':
  Add ThermalObserver system service to capture thermal state uevents.
 2015-09-26 06:55:22 +00:00
Ned Burns
99fa24ff71 am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit '11b87b9109717b30729e2ce01ac5014ba91c1051':
  Kill ActivityView's background thread when it's destroyed
 2015-09-26 06:54:22 +00:00
Bryce Lee
6ad696c35b am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 
* commit 'f0740e0a2e51d2cb9b6e9ea7fbd251bfa9b2a0ad':
  Add ThermalObserver system service to capture thermal state uevents.
 2015-09-26 01:41:22 +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
Todd Kennedy
389bb7f509 am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master 
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
  Pass dexopt flags as integer
 2015-09-25 22:17:06 +00:00
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master 
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
 2015-09-25 15:06:49 -07:00
Ned Burns
11b87b9109 am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit '1b69fcbf810a805a0fa3dbfc6a3d7cc49d87f33e':
  Kill ActivityView's background thread when it's destroyed
 2015-09-25 21:20:08 +00: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
Todd Kennedy
fa54ab7950 Pass dexopt flags as integer 
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.

Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
 2015-09-25 13:52:33 -07:00
Gus Prevas
3197cd36fe am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev 
* commit '41110261bb4f9f733b579b3dc26d3d6de5642ef5':
  Adds an option to override RemoteViews transition.
 2015-09-25 18:09:41 +00:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
 2015-09-25 18:07:52 +00:00
Gus Prevas
41110261bb am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev 
* commit 'b17d1e5e6aa53f5925efc2135b9a603a9a0ed2df':
  Adds an option to override RemoteViews transition.
 2015-09-25 17:24:39 +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
Baligh Uddin
9db221c88c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-25 02:56:40 +00:00
Jorim Jaggi
f9f9999d32 am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'b7b9b31f6969dc48174757ec236622f8d49222d0':
  Deliver camera launch source for analytics
 2015-09-25 01:38:07 +00: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
Baligh Uddin
566c766027 Import translations. DO NOT MERGE 
Change-Id: Iebbf559a27c2c55ec7f172ad7e6592e86452edff
Auto-generated-cl: translation import
 2015-09-24 18:10:14 -07:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -07:00
Todd Kennedy
4e32174517 resolved conflicts for cafacef6 to stage-aosp-master 
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
 2015-09-24 14:34:06 -07:00
Todd Kennedy
cafacef60e Merge "Frameworks/base: Propagate boot status to installd" 2015-09-24 20:35:09 +00:00
Andreas Gampe
55fe944f98 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
(cherry picked from commit 06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
 2015-09-24 12:27:25 -07:00
Elliott Hughes
ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master 
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables
 2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master 
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
 2015-09-24 10:01:32 -07:00
Elliott Hughes
a884d81e86 Merge "constify JNINativeMethod function pointer tables" 2015-09-24 16:01:15 +00:00
Vinit Deshpande
64f6236cdd am 2bc3ff3c: am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev 
* commit '2bc3ff3cf6b692a4bd69d75cb3e11fc0b0b063fe':
  Disable wifi firmware logging by default
 2015-09-24 04:26:03 +00:00
Vinit Deshpande
2bc3ff3cf6 am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev 
* commit 'de02fe2afdc835eca72bb05a1514daa439bb2b40':
  Disable wifi firmware logging by default
 2015-09-24 04:17:40 +00:00
Vinit Deshpande
de02fe2afd am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev 
* commit '629909e02b97796ff0b79dbd03c2e72dd3d1e6bb':
  Disable wifi firmware logging by default
 2015-09-24 04:05:26 +00:00
Vinit Deshpande
629909e02b Merge "Disable wifi firmware logging by default" into mnc-dr-dev 2015-09-24 03:58:38 +00: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
Vinit Deshpande
4b3634513b Disable wifi firmware logging by default 
This is really needed for debugging phase, which is over
now; and disabling it will reduce surface area

Bug: 24317401

Change-Id: I0acf9efc94333cb274d4286df9c853431d86883d
 2015-09-23 16:57:18 -07: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
Baligh Uddin
5115b26935 Import translations. DO NOT MERGE 
Change-Id: Ia019f181e358d2925493075488bea307f7131215
Auto-generated-cl: translation import
 2015-09-23 01:23:51 -07:00
Daniel Micay
76f6a86de2 constify JNINativeMethod function pointer tables 
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
 2015-09-22 17:10:35 -04:00
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
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
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