Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,734 Commits 3 Branches 0 Tags
6d7bd14a7e94f8a7841aa522bd36323897a38696
Commit Graph

53089 Commits

Author SHA1 Message Date
Chris Wren
6d7bd14a7e am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev 
* commit '17de4b2a73996366ff3d7759793a6809654caebe':
  remove usage of deprecated method setLatestEventInfo
 2015-06-12 19:40:13 +00:00
Chris Wren
17de4b2a73 Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev 2015-06-12 19:28:54 +00:00
Rubin Xu
0217233774 am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 
* commit '6161eb3494837cb7031b940e02fcbf5449e5be77':
  Update doc of ACTION_PROVISION_MANAGED_DEVICE
 2015-06-12 18:42:26 +00:00
Rubin Xu
6161eb3494 Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 2015-06-12 18:27:45 +00:00
Amith Yamasani
22e1b2d8ed am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev 
* commit 'ffff74abb13ad8c0e25175bd361d570a8e5e1406':
  Report app standby state to batterystats
 2015-06-12 18:07:39 +00:00
Amith Yamasani
ffff74abb1 Merge "Report app standby state to batterystats" into mnc-dev 2015-06-12 17:52:55 +00:00
Przemyslaw Szczepaniak
e08689036f am 7ae22652: Merge "Fixes for API Review: android.speech.tts" into mnc-dev 
* commit '7ae22652a5c48f0d2590b8caf2ea9e040c2f0023':
  Fixes for API Review: android.speech.tts
 2015-06-12 17:50:49 +00:00
Przemyslaw Szczepaniak
7ae22652a5 Merge "Fixes for API Review: android.speech.tts" into mnc-dev 2015-06-12 17:34:13 +00:00
Przemyslaw Szczepaniak
f77b2de1a9 Fixes for API Review: android.speech.tts 
Bug: 21571893
Change-Id: Icd25f4aa9a465050c7410c7bfec004a71ba24548
 2015-06-12 18:32:13 +01:00
Jeff Sharkey
c0982ba82c am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev 
* commit '54b65ff3004a1585867e8c3c4d267b381123e179':
  Annotate ContentProviderClient arguments.
 2015-06-12 17:12:49 +00:00
Jeff Sharkey
54b65ff300 Merge "Annotate ContentProviderClient arguments." into mnc-dev 2015-06-12 16:57:56 +00:00
Jeff Sharkey
73ed509d44 Annotate ContentProviderClient arguments. 
Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: Id0a208a38c5a9ea19dddbe60c65d285645d08bb0
 2015-06-12 09:49:31 -07:00
Dianne Hackborn
e4b954a111 am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit '8a435ced674562b827f91800317a89056e050b15':
  Fix APIs.
 2015-06-12 16:48:16 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Alex Klyubin
38f1d726a8 am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev 
* commit '738241f93c066a2ef233dd0e12661bf808bfd915':
  Document that DownloadManager supports HTTPS.
 2015-06-12 16:12:01 +00:00
Amith Yamasani
6776849dc5 Report app standby state to batterystats 
Also reduce idle checks to the target user if possible.
Optimized calls to some internal methods

Bug: 21639147
Change-Id: If1faf26f862e5c4ca905f2603a4ba52a8d1af954
 2015-06-12 09:05:22 -07:00
Alex Klyubin
738241f93c Merge "Document that DownloadManager supports HTTPS." into mnc-dev 2015-06-12 16:02:17 +00:00
Chet Haase
8896a51cdd am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev 
* commit 'e61fc94b9b6d4ccba60cca9ac0e0a67539f18780':
  Remove View.getBackgroundColor()
 2015-06-12 15:03:01 +00:00
Chet Haase
e61fc94b9b Merge "Remove View.getBackgroundColor()" into mnc-dev 2015-06-12 14:50:20 +00:00
Rubin Xu
a4f9dc1cf0 Update doc of ACTION_PROVISION_MANAGED_DEVICE 
It also supports an optional extra EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE

Bug: 21797182
Change-Id: Ie145e6a79dd7eebdbb4cc58e1baba761b9cc5bbf
 2015-06-12 15:18:59 +01:00
Chris Wren
1ce4b6d3c6 remove usage of deprecated method setLatestEventInfo 
Bug: 18510449
Change-Id: I56a77991c729990e501f402e007dfa79ee57621e
 2015-06-12 10:16:04 -04:00
Chet Haase
3dcb9945fd Remove View.getBackgroundColor() 
This method was added earlier in M - removing it now based on API
Council feedback.

Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: I04fad49c3c377218d0fb708dbeaea609aca46ce8
 2015-06-12 13:25:27 +01:00
Keisuke Kuroyanagi
2a9fa33626 am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 
* commit 'a31940df170ea7e8253736ce7b5dba2176699c25':
  Reset drag accelerator state in Editor#sendOnTextChanged.
 2015-06-12 11:20:32 +00:00
Keisuke Kuroyanagi
a31940df17 Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 2015-06-12 11:10:20 +00:00
Rubin Xu
1cd7136b52 am 5c82d2cc: Change references to APK Certificate to Signature 
* commit '5c82d2cc17df9774e677f6bab9cb52659fc2b56d':
  Change references to APK Certificate to Signature
 2015-06-12 10:05:00 +00:00
Rubin Xu
5c82d2cc17 Change references to APK Certificate to Signature 
The fact that currently apk signature is certificates is just
implementation details.

Bug: 20820366

Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
 2015-06-12 10:32:24 +01:00
Jeff Sharkey
a8b270efa7 am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 
* commit '3c4d613926afb38673e0ffccc624d271f7910ec1':
  Sigh, some apps are sending null ContentValues.
 2015-06-12 05:03:03 +00:00
Yohei Yukawa
a5980b9213 am 09259de0: Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 
* commit '09259de032c5209cbc8c094bd4121358932f1139':
  Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
 2015-06-12 05:02:59 +00:00
Jeff Sharkey
3c4d613926 Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 2015-06-12 04:57:08 +00:00
Jeff Sharkey
34796bd07f Sigh, some apps are sending null ContentValues. 
Bug: 21560515
Change-Id: Id5a62611781a2d9da47ad3e522d3d43f860b1f70
 2015-06-11 21:55:32 -07:00
Yohei Yukawa
09259de032 Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 2015-06-12 04:53:07 +00:00
Jeff Sharkey
8fcc73f32b am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 
* commit '1c83a0430fc36e59ee736021c54a35587981030a':
  Annotate ContentResolver/Provider arguments.
 2015-06-12 04:51:26 +00:00
Jeff Sharkey
1c83a0430f Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 2015-06-12 04:46:15 +00:00
Jeff Sharkey
673db44fb3 Annotate ContentResolver/Provider arguments. 
Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: I5f671c241dfe65e5ab8bc06b2382fbf5a82bdb20
 2015-06-11 21:45:05 -07:00
Yohei Yukawa
fd65287cfd Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b. 
Fix confirmed with 'make doc-comment-check-docs'

Bug: 21446448
Change-Id: Ica4359b13ddbc790740cc22c95b9e002f7c8e4b8
 2015-06-11 21:42:49 -07:00
Jeff Sharkey
efb3159beb am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit '5347f0ff3857baae7b889d24acd352cabcc9205b':
  Valid filenames have length limits!
 2015-06-12 02:28:57 +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
Adam Powell
f6396f3515 am de64ac45: Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev 
* commit 'de64ac459917d65c9e60ae04deac37b7f965a69c':
  Check targetSdkVersion when passing size hints for UNSPECIFIED specs
 2015-06-12 00:51:53 +00:00
Yohei Yukawa
bef9e5cb18 am d4673355: Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev 
* commit 'd46733556be3fdcdc3ba3c5339c595406c960b09':
  Keyboard.Key#onReleased() should handle inside parameter.
 2015-06-12 00:51:43 +00:00
Adam Powell
de64ac4599 Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev 2015-06-12 00:45:23 +00:00
Ruben Brunk
9f44201c65 am 25f3a7d1: Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 
* commit '25f3a7d19b2fb9b33cb83d3d8f90c724cd26c9c9':
  Make CameraDeviceImpl#close() idempotent (for real).
 2015-06-12 00:41:30 +00:00
Yohei Yukawa
d46733556b Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev 2015-06-12 00:38:25 +00:00
Ruben Brunk
25f3a7d19b Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 2015-06-12 00:25:48 +00:00
Navtej Singh Mann
efd5a2239f am 3c0ce5ca: fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
* commit '3c0ce5ca14ba13f432f4309c001abcb1d7cfc159':
  fix ArrayIndexOutOfBoundsException while starting WifiScannerScan
 2015-06-12 00:18:56 +00:00
Navtej Singh Mann
3c0ce5ca14 fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
bug: 21663831
Change-Id: I9aea30907aae00c98d8fb1dc1fff3f4935108fa4
 2015-06-11 17:04:15 -07:00
Dianne Hackborn
39a87c7332 am 2430f47b: Merge "Add ArraySet to the SDK." into mnc-dev 
* commit '2430f47be7b7de7456e16eb5098242c22a6317ee':
  Add ArraySet to the SDK.
 2015-06-11 23:22:41 +00:00
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +00:00
Ruben Brunk
0953b6461a Make CameraDeviceImpl#close() idempotent (for real). 
- Also fixes onClosed() implementation in CameraDeviceImpl;
  this would never return true previously.

Bug: 21698939
Change-Id: I4dd56a1410b9fc64152acc5296514f5841794fa9
 2015-06-11 16:12:35 -07:00