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

76062 Commits

Author SHA1 Message Date
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
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
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -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
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
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 c5ac16f531504d5bde7c87f8e3088652daeb543f)
 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 f48029f00a66e23d7872a00b56fbcf88528ba476.

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
2a06860609 am c89f3a48: am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit 'c89f3a483330498d69a6c706b78c3a0aea5298a0':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:09:06 +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
Baligh Uddin
78ef803faf Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:44:50 +00: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
08b0042335 am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev 
* commit '1f46395702f609d90909df39ab990844c0731952':
  Add support for setting color transforms
 2015-09-19 00:37:52 +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
Vineeta Srivastava
2a554841f3 am 1762a44f: am 7e765dd7: am 22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev 
* commit '1762a44f9f31e5bdeb2f5d96e77c25d46763837b':
  set config_use_sim_language_file false for SE Telia/Sweden 3G
 2015-09-19 00:23:08 +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
Vineeta Srivastava
1762a44f9f am 7e765dd7: am 22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev 
* commit '7e765dd7f59dd18dbcf132e582b6f42c060cde32':
  set config_use_sim_language_file false for SE Telia/Sweden 3G
 2015-09-18 22:29:16 +00:00
Adam Lesinski
3bdbda7806 am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 
* commit 'dd0238ec7d1ec38609399ab1060f76534bee8cd6':
  Fix crash when no power_profile is specified
 2015-09-18 22:29:09 +00:00
Vineeta Srivastava
7e765dd7f5 am 22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev 
* commit '22fe39b49c1d7cb22d8dfbb4f8e98af28be48a24':
  set config_use_sim_language_file false for SE Telia/Sweden 3G
 2015-09-18 22:21:36 +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
Vineeta Srivastava
22fe39b49c Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev 2015-09-18 22:19:41 +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
sangjoon84.lee
d4bcb286fb set config_use_sim_language_file false for SE Telia/Sweden 3G 
BUG=24184934

Change-Id: I721b3e6c29b78a792a15ab4ba72a81a3f4ce270d
 2015-09-18 15:15:16 -07:00