Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,674 Commits 3 Branches 0 Tags
ccd6d0c14decd111e7e12bf9844fa5ff75aa912e
Commit Graph

2484 Commits

Author SHA1 Message Date
Dianne Hackborn
ccd6d0c14d am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit 'd55860d990587509f0e9624c44494172f3e24714':
  Fix APIs.
 2015-06-12 17:31:21 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Jeff Sharkey
c1a54115bd am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit '2e9704f969df4d140f4c54243c6faabf17517144':
  Valid filenames have length limits!
 2015-06-12 02:41:30 +00:00
Jeff Sharkey
5347f0ff38 Merge "Valid filenames have length limits!" into mnc-dev 2015-06-12 02:18:29 +00:00
Jeff Sharkey
4f5e8b3ca4 Valid filenames have length limits! 
ext4 filenames are at most 255 bytes.  vfat filenames are bit more
lax, but we're often saving them on ext4 through a FUSE daemon, so
limit them the same way.

Since package names are used as directory names, verify that they're
valid filenames.

Tests to verify behavior.

Bug: 18689171
Change-Id: If7df4c40d352954510b71de4ff05d78259c721ed
 2015-06-11 19:16:27 -07:00
Dianne Hackborn
ece0f4f519 Fix APIs. 
Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000: API Review: android.content.IntentFilter
Issue #20654534: API Review: android.app.assist

Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.

Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
 2015-06-11 18:07:43 -07:00
Jeff Sharkey
03d3aefd3e am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'a6f89a07f191c8f80d7cbce62b178f8bdc23ec18':
  Ignore some more generic USB device names.
 2015-06-11 21:10:50 +00:00
Makoto Onuki
ed5d2dc274 am cc0c8a48: am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'cc0c8a48422e0bb5a1f699fdb12d12691004fe7c':
  Fix the PFD detachFd issue.
 2015-06-11 20:05:28 +00:00
Jeff Sharkey
c8488e99e8 Merge "Ignore some more generic USB device names." into mnc-dev 2015-06-11 19:57:25 +00:00
Jeff Sharkey
47b872d9c3 Ignore some more generic USB device names. 
Bug: 21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
 2015-06-11 12:54:42 -07:00
Makoto Onuki
b30ad6f5e8 Fix the PFD detachFd issue. 
Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703
 2015-06-11 12:34:22 -07:00
Svetoslav
47db722168 am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '0525c07f30f08008883cf2845afa3bf81f888c55':
  Add system API to watch for permission changes
 2015-06-11 12:53:42 +00:00
Svetoslav
75a0ee081f Merge "Add system API to watch for permission changes" into mnc-dev 2015-06-11 08:02:06 +00:00
Svetoslav
f7c06eb03a Add system API to watch for permission changes 
Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
 2015-06-10 21:24:13 -07:00
Jeff Sharkey
51b055d330 am e1844c83: am 5fc24733: New strings! 
* commit 'e1844c8302c57e231b85b2fb3cb59fb7f569a270':
  New strings!
 2015-06-11 01:51:09 +00:00
Jeff Sharkey
5fc247338d New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
 2015-06-10 16:49:11 -07:00
Adam Lesinski
5b02907c97 am 9702b5d9: am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 
* commit '9702b5d98824df4fafce821ce9fe15907586b9b1':
  Add more blaming output to batterystats dumpsys
 2015-06-10 23:15:25 +00:00
Adam Lesinski
628ef9cbed Add more blaming output to batterystats dumpsys 
Change-Id: I3216f13f16d89a72617d54638df43ce39183da9e
 2015-06-10 13:08:57 -07: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
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
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
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