Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
217,602 Commits 3 Branches 0 Tags
8d6edc3270616b119645fbdf8752c0ea37de0731
Commit Graph

2675 Commits

Author SHA1 Message Date
Jack Yu
6714030083 merge from master 
Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
 2015-12-10 12:27:58 -08:00
Nicolas Geoffray
5485d81578 Merge "Remove DEBUG_JIT from Zygote flags." 
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 10:54:19 +00:00
Nicolas Geoffray
245ec92b65 Remove DEBUG_JIT from Zygote flags. 
The flag is being obsolete by the move to JIT.

(cherry picked from commit 9abbf45c8d)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
 2015-11-18 10:07:53 +00:00
Casey Dahlin
7a38be6112 Merge "Add hidden support for arrays of raw file descriptors" 
am: 376d5f350c

* commit '376d5f350c6618d915338a9927b5d0f5fb61eba8':
  Add hidden support for arrays of raw file descriptors
 2015-11-12 23:57:58 +00:00
Casey Dahlin
2f974b252f Add hidden support for arrays of raw file descriptors 
Change-Id: I4013e0700369764a26485d8620ebf16d8bea1951
Test: Built and ran Android in an emulator
Bug: 25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-11-12 14:13:15 -08:00
Adrian Roos
989b719e64 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b 
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:25:02 +00:00
Adrian Roos
a53bbb652b Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev 
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 17:29:13 +00:00
Adrian Roos
0450565d9a Revert "Revert "Track ashmem memory usage in Parcel"" 
This reverts commit e2adb2cf0f.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
 2015-10-22 17:49:38 -07:00
Ian Pedowitz
d3511518f9 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:46:06 +00:00
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:32:37 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel" 
This reverts commit ab3f972403.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
 2015-10-22 22:09:04 +00:00
Adrian Roos
b531762c89 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel
 2015-10-22 01:02:27 +00:00
Adrian Roos
655c12edb0 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev 
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
  Track ashmem memory usage in Parcel
 2015-10-22 00:49:52 +00:00
Adrian Roos
ab3f972403 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5)
 2015-10-22 00:31:47 +00:00
Tao Bao
db33bfc2a9 Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f 
am: ac140e7f76

* commit 'ac140e7f7690979378897546e7934381f62922ab':
  Clean up the uncrypted OTA package on bootup.
 2015-10-21 18:05:18 +00:00
Tao Bao
ac140e7f76 Merge "Clean up the uncrypted OTA package on bootup." 
am: 5d562d4d2f

* commit '5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
  Clean up the uncrypted OTA package on bootup.
 2015-10-21 17:51:53 +00:00
Tao Bao
87212ad6a8 Clean up the uncrypted OTA package on bootup. 
An OTA package needs to be uncrypted before rebooting into recovery if
it sits on an encrypted /data partition. Once uncrypt gets started, we
cannot re-run it on the package again. Because the file may have been
fully or particially uncrypted and we may end up with a corrupt file
under recovery. Always clean up the package when the device boots into
the normal system to avoid that.

Bug: 24973532
Change-Id: I91682c103d1f2b603626c4bf8d818bced71e3674
 2015-10-19 14:49:09 -07:00
Jeff Sharkey
de0b34ea14 am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit 'd56756fdee9fce3d08bea769710d7173bcbc263a':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:38:29 +00:00
Jeff Sharkey
535726f637 am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:25:38 +00:00
Jeff Sharkey
0c15693e8d Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 2015-10-16 16:18:38 +00:00
Dianne Hackborn
1e46ee937c am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit '522222bc9bbfb6d62e101eaa6af2668277143e19':
  Docs only change: update build version docs.
 2015-10-15 01:16:00 +00:00
Dianne Hackborn
f96ca3441e am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit '75765dbe48ed38d7044f458062510a9082750049':
  Docs only change: update build version docs.
 2015-10-15 01:05:54 +00:00
Dianne Hackborn
75765dbe48 am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit 'e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
  Docs only change: update build version docs.
 2015-10-15 01:01:12 +00:00
Jeff Sharkey
59d28dc820 Update docs to reflect adoptable behavior. 
Update storage related docs on Context to be consistent, and to call
out relevant Environment methods.  Start calling it "shared" storage,
and only mention external for historical reasons.  Mention that there
isn't much benefit to using emulated storage over private data
directories to help guide developers to safer locations.

Point out which paths can change over time, so developers know to
only persist relative paths.

Update Environment docs to reflect how they behave for the new
class of adopted storage devices.

Bug: 24251945
Change-Id: Ie5ab337649b4740dfd7594997bbb19c4969cfd2f
 2015-10-14 14:41:23 -07:00
Dianne Hackborn
a7036ce15a am 05222c34: am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev 
* commit '05222c3440d1ba207fe6f87037a8297f33f3318a':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
 2015-10-13 00:20:42 +00:00
Dianne Hackborn
829920ede0 am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev 
* commit '34c120dc6142c861cb131c900cdee3c19f81ce51':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
 2015-10-12 23:00:20 +00:00
Dianne Hackborn
b02ce29144 "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack... 
...due to lack of permissions

Still doesn't, but an alternative is now offered.

Change-Id: I7b9da709c96ed7790c70d686c30c7855f3979778
 2015-10-12 15:14:16 -07:00
Daniel Erat
f0e8744620 am d3e3d889: am c3f37589: Merge "Update instructions in IPowerManager.aidl." 
* commit 'd3e3d8896ea0f2eba1424b57ac8a5b5d9287000c':
  Update instructions in IPowerManager.aidl.
 2015-09-30 21:39:01 +00:00
Daniel Erat
d3e3d8896e am c3f37589: Merge "Update instructions in IPowerManager.aidl." 
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
  Update instructions in IPowerManager.aidl.
 2015-09-30 21:30:31 +00:00
Daniel Erat
22f58762e1 Update instructions in IPowerManager.aidl. 
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.

Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
 2015-09-30 14:55:35 -06:00
Dianne Hackborn
e7a3435c91 Docs only change: update build version docs. 
Change-Id: I30f55549394693ea04cd390b1ae66347ae212123
 2015-09-24 17:32:26 -07: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
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
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 Lesinski
6832f39416 BatteryStats: Better big-little CPU accounting 
Generalize cpu clusters so we can measure frequency
and power usage across heterogeneous cpu clusters.

This also brings back reading of cpu-times for power calculation.

Bug:22773176
Change-Id: I9c794ae9756c782c0e971c7f5fcebbe70374b269
 2015-09-09 17:07:54 -07:00
Nick Armstrong-Crews
13d2fa50b0 am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze. 
* commit '740cf71c9978e5dcb0a68b6558531a52dc26d44f':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-08 05:28:51 +00:00
Nick Armstrong-Crews
56ecfcce6c Handle KEYCODE_SOFT_SLEEP from Ungaze. 
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
 2015-09-07 21:46:50 -07:00
Nick Armstrong-Crews
d70377b537 am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 
* commit '36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
 2015-09-08 04:43:38 +00:00
Nick Armstrong-Crews
b331bf9514 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze." 
This reverts commit 677adf1e66.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
 2015-09-08 04:25:01 +00:00
Nick Armstrong-Crews
7f37402d8c am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 
* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-04 18:22:54 +00:00
Nick Armstrong-Crews
677adf1e66 Handle KEYCODE_SOFT_SLEEP from Ungaze. 
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
 2015-09-04 10:20:22 -07:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
 2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
 2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Adam Lesinski
f7ce28fad5 am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 
* commit 'd0ce1fbbba497e9b5082c69d8da7260e85b0b579':
  BatteryStats: Start using cpu power from kernel
 2015-08-31 19:33:24 +00:00
Adam Lesinski
da43a3aaca Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 2015-08-31 19:04:46 +00:00
Ashish Sharma
b804f4134a am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev 
* commit 'fec26a37a15dc406ae6a3aee67059cb93ef2ae5a':
  BatteryStats: Bump checkin version
 2015-08-27 23:55:47 +00:00