Commit Graph

2475 Commits

Author SHA1 Message Date
Andreas Gampe
36c28ee543 am e95f4bf1: am 3f2fbf7e: am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev
* commit 'e95f4bf113e8274f591b8fcc4b6f9d609ce5b978':
  Frameworks/base: Add is64Bit method to Process
2015-06-09 18:58:49 +00:00
Andreas Gampe
e95f4bf113 am 3f2fbf7e: am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev
* commit '3f2fbf7e1fa8338cc7d700c951a750f353bdff84':
  Frameworks/base: Add is64Bit method to Process
2015-06-09 18:43:32 +00:00
Andreas Gampe
2c936af815 Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 2015-06-09 18:20:00 +00:00
Richard Uhler
fb12ff0daa am c5de6931: am d58abdd1: am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev
* commit 'c5de6931c162c0ec5153f16c1653cee5527bf383':
  Add Debug.MemoryInfo.getMemoryStats API.
2015-06-09 17:27:29 +00:00
Richard Uhler
c5de6931c1 am d58abdd1: am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev
* commit 'd58abdd12f79bebad894ea54973ef57061e7dc15':
  Add Debug.MemoryInfo.getMemoryStats API.
2015-06-09 17:12:32 +00:00
Richard Uhler
659716d7a0 Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 2015-06-09 16:40:57 +00:00
Andreas Gampe
ee0cdce2a8 Frameworks/base: Add is64Bit method to Process
Add a public method to Process to query whether the current runtime
is running in 64-bit mode.

Bug: 21069469
Change-Id: Ifaf4251f05bbe5eba135fa977190e475632856bd
2015-06-09 09:22:55 -07:00
Ruben Brunk
790e1cc3c6 am 4335fbfe: am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '4335fbfe173083bc1be3989beeac74fc02deef37':
  Add UI for camera + flashlight battery reporting.
2015-06-06 00:45:22 +00:00
Ruben Brunk
4335fbfe17 am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '533514c9b5bf05bbba33e2499618fa3c47f31451':
  Add UI for camera + flashlight battery reporting.
2015-06-06 00:29:50 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Ruben Brunk
5b1308f02d Add UI for camera + flashlight battery reporting.
Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09
2015-06-04 16:41:11 -07:00
Tim Kilbourn
9603852e08 am 9c76cfae: am 57914802: Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev
* commit '9c76cfae296e15bfe6d1f95d161ac294d7493380':
  DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
2015-06-04 23:07:53 +00:00
Tim Kilbourn
4bf27b53b9 DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
When the socketpair communication channel was added to
ParcelFileDescriptor, the CREATOR method for DropBoxManager.Entry was
not updated to read the extra fd from the Parcel. This was causing reads
to end too early.

Also removed comments referring to the now-deleted native methods in
the native Parcel implementation.

Change-Id: I49a9691da6ea927382ceb2fcbfdc7985a601111b
(cherry picked from commit ba953230f7)
2015-06-04 21:37:50 +00:00
Paul Crowley
326a0acde1 Merge "Delete the user key when deleting a user." 2015-06-04 12:08:47 +00:00
Tim Kilbourn
20fc439fe7 Merge "Fix DropBoxManager.Entry parcels with fds." 2015-06-04 00:29:17 +00:00
Tim Kilbourn
ba953230f7 Fix DropBoxManager.Entry parcels with fds.
When the socketpair communication channel was added to
ParcelFileDescriptor, the CREATOR method for DropBoxManager.Entry was
not updated to read the extra fd from the Parcel. This was causing reads
to end too early.

Also removed comments referring to the now-deleted native methods in
the native Parcel implementation.

Change-Id: I49a9691da6ea927382ceb2fcbfdc7985a601111b
2015-06-03 11:26:50 -07:00
Paul Crowley
8692b7e5a1 Merge "Use mount service to create user dirs." 2015-06-03 12:54:00 +00:00
Amith Yamasani
9984f181c5 am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
  Temporarily whitelist an app for network during doze
2015-06-02 21:10:40 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
2015-06-02 11:05:03 -07:00
Richard Uhler
350e6dc985 Add Debug.MemoryInfo.getMemoryStats API.
The initial list of supported memory stats is:
  summary.java-heap
  summary.native-heap
  summary.code
  summary.stack
  summary.graphics
  summary.private-other
  summary.system
  summary.total-pss
  summary.total-swap

Bug: 21266903
Change-Id: Ic3b0e16a8eca4325f3738c389f069933618f66b0
2015-06-02 09:48:31 -07:00
Ruben Brunk
8b2cf64630 am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
  Track camera and flashlight usage in battery stats.
2015-06-02 14:24:01 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Ruben Brunk
6d2c363fd5 Track camera and flashlight usage in battery stats.
Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
2015-06-01 16:54:23 -07:00
Andres Morales
ab21d60c24 am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
* commit '9250d9727b5a71267cb33b535bdd959c1c03b11a':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
2015-06-01 18:51:32 +00:00
Stuart Scott
c96a66dd03 am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset.
* commit '378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
  Network Reset should have a lockdown like Factory Reset.
2015-06-01 18:50:39 +00:00
Andres Morales
0fddb1a631 Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 2015-06-01 17:50:58 +00:00
Andres Morales
c97b92e346 Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
This reverts commit 831e01a89e.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a
2015-06-01 17:50:43 +00:00
Stuart Scott
e3e314df4d Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb2)
2015-06-01 16:31:00 +00:00
Andres Morales
0b8ddb4792 am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery
2015-06-01 15:22:42 +00:00
Andres Morales
a5705a4ada Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 2015-05-28 23:41:04 +00:00
Tao Bao
69dd849ed3 am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
* commit '5f90a8c5bd689afa8403d7dce967bf96a82880c4':
  Wait for uncrypt to finish before rebooting
2015-05-28 22:35:45 +00:00
Adam Lesinski
1d4db0e4a6 am e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
* commit 'e87126e8915785e1801580d44ea181304bbfa701':
  BatteryStats: Output per-app wifi controller distribution
2015-05-28 22:34:37 +00:00
Tao Bao
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +00:00
David Srbecky
9d698acfc4 am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."
* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
  Replace --include-cfi with --generate-debug-info.
2015-05-28 20:16:45 +00:00
Adam Lesinski
8a179cab79 Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 2015-05-28 20:04:18 +00:00
Adam Lesinski
049c88b48a BatteryStats: Output per-app wifi controller distribution
Currently we only output this data on checkin, adding the output
to dumpsys as well.

Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0
2015-05-28 12:51:19 -07:00
David Srbecky
f39477b592 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-05-28 17:16:09 +01:00
Paul Lawrence
3452d2d0db Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-26 21:52:58 +00:00
Nicolas Prevot
5e0ef0d0e6 Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 2015-05-26 20:39:28 +00:00
Nicolas Prevot
298f98fa23 Say in the doc that DISALLOW_CONFIG_VPN now works.
BUG:18902920
Change-Id: I761cba1f1e01fbe88f773887bf4e9233fc85cfef
2015-05-22 16:43:03 -07:00
Paul Crowley
85e4e818d8 Delete the user key when deleting a user.
BUG=19706593

Change-Id: I36ec1b987f5a07450c6a564c74f124ec8d3403ad
2015-05-22 16:50:35 +01:00
Paul Crowley
9102f5d953 Use mount service to create user dirs.
Bug: 19704432
Change-Id: Iee037ca653482b0ee7bf59c7ba193c75411fe42f
2015-05-22 15:11:14 +01:00
Dianne Hackborn
e5c4262109 Improve reporting to apps of transaction too large failures.
If the app tried to do various things with too much data --
starting an activity, starting a service, sending a broadcast --
this would fairly silently fail with little indication of what
was going on.  Fix this in two ways:

- Now when the native code generates a TransactionTooLargeException,
  it may include an additional message in it telling you how much
  data was in the parcel being sent, to help you understand why
  this happening.

- In all the framework code paths where we call to the system and
  may fail, convert these failures into a a runtime exception and
  rethrow them back to the app so that it will clearly get the
  above message.

Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128
2015-05-21 18:19:50 -07:00
Tao Bao
90237f7beb Wait for uncrypt to finish before rebooting
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Bug: 20012567
Bug: 20949086
Change-Id: I2348a98312c4dae81f618b45a2ee3b4cf6246ff5
2015-05-21 16:26:08 -07:00
Jeff Sharkey
f5a6bd7538 Push initial disk state, handle empty media.
Stash volume count from last scan, and use it to push initial storage
notifications state when listener is first attached.

Also omit disks with invalid size, which usually means they're an
empty slot with no media.

Bug: 20503551
Change-Id: I75097035aebaad70ba32437179a863f6a0910aa5
2015-05-19 14:57:22 -07:00
Nicolas Prevot
5f645339e4 Merge "Allow creating a managed profile if there is only one user." into mnc-dev 2015-05-19 17:52:15 +00:00
Dianne Hackborn
d23e0d6901 Update power manager to track uid state like netstats.
To follow the correct semantics for when restricts due to
device idle can be applied, power manager need to know about
uid process states like net policy so that it can allow
wake locks from apps that are in the foreground.

Since this is being added to a second place, I reworked things
so that the activity manager now keeps track of per-uid process
states and allows apps to register to listen to those, rather
than having to track lower-level process states and transform
them into an overall uid state.  Both net policy and power
manager use this new facility.

Change-Id: I77359164c40d0f36fe1ef296dd9f9c3062431148
2015-05-18 18:13:41 -07:00
Jeff Brown
d5538758af Merge "Rename file descriptor listener API." into mnc-dev 2015-05-18 22:47:47 +00:00
Paul Lawrence
d8fdb33891 Honor password visible setting in CryptKeeper
Bug: 20184626

Change-Id: Ida0f34299947a5d4067406cc6e029fb841077804
2015-05-18 15:13:21 -07:00