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

48869 Commits

Author SHA1 Message Date
Makoto Onuki
6a8cc98fa4 am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit 'bd25b5f6021295932a8ce2a6fa534dc37dacf249':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 00:35:54 +00:00
Makoto Onuki
bd25b5f602 Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 2015-06-13 00:28:20 +00:00
Makoto Onuki
34bdcdb105 Fix ArrayIndexOutOfBoundsException in Transport.query 
The bug was that it used getCount() instead of getColumnCount().

Bug 21727804

Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
 2015-06-12 17:16:23 -07:00
Makoto Onuki
e35e46acd6 am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit '80b34d7b9da0e0738a4a1db78d83cd804372594b':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:05:03 +00:00
Makoto Onuki
80b34d7b9d Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 2015-06-12 23:56:10 +00:00
Ruben Brunk
43918a1348 am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '8491d2dea90bf462b09befb604138a77d746f94a':
  Fix rounding width.
 2015-06-12 23:45:27 +00:00
Ruben Brunk
8491d2dea9 Merge "Fix rounding width." into mnc-dev 2015-06-12 23:34:51 +00:00
Adam Lesinski
ea60230592 am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 
* commit 'cd9d7b7b076ff28bef5403b97754ae2853db17ee':
  App Standby: Convert constants to Settings.Global
 2015-06-12 23:31:35 +00:00
Jeff Sharkey
f39c53f220 am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit '1d04e6a6cd06062483e22b387c6c1a615e4e5088':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:31:30 +00:00
Adam Lesinski
a32f9f7847 am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit '87a79c394dcecd28c3811615ce975abcde185255':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:31:25 +00:00
Adam Lesinski
cd9d7b7b07 Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 2015-06-12 23:20:28 +00:00
Jeff Sharkey
1d04e6a6cd Merge "More useful extras in disk/volume broadcasts." into mnc-dev 2015-06-12 23:19:34 +00:00
Adam Lesinski
a6232df053 App Standby: Convert constants to Settings.Global 
Use settings instead of hardcoded constants, and listen for their changes.

Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
 2015-06-12 16:19:07 -07:00
Adam Lesinski
87a79c394d Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 2015-06-12 23:17:47 +00:00
Jeff Sharkey
c7acac6798 More useful extras in disk/volume broadcasts. 
Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
 2015-06-12 16:16:56 -07:00
Ruben Brunk
68e4fc8ca9 Fix rounding width. 
Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
 2015-06-12 16:16:42 -07:00
Adam Lesinski
57123001a4 BatteryStatsHelper: Fix some lost power 
Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.

Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.

Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
 2015-06-12 16:12:07 -07:00
Makoto Onuki
9dc575d63c Add StorageEventListener.onDiskDestroyed() 
Bug 21336042

Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
 2015-06-12 16:11:46 -07:00
Ruben Brunk
531106c7a8 am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev 
* commit 'e36829ee00d178846cb95bebde41cc9204edcd76':
  Fix legacy disconnect callback.
 2015-06-12 22:32:59 +00:00
Ruben Brunk
e36829ee00 Merge "Fix legacy disconnect callback." into mnc-dev 2015-06-12 22:21:54 +00:00
Ruben Brunk
b44864e76b Fix legacy disconnect callback. 
Bug: 21708377
Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
 2015-06-12 14:39:12 -07:00
Dianne Hackborn
0016225663 am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev 
* commit 'e554cc96597d4b738f14a1514772e4d49e78c542':
  Implement some control over ALLOW_WHILE_IDLE alarms.
 2015-06-12 19:40:26 +00:00
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
Dianne Hackborn
e554cc9659 Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev 2015-06-12 19:38:39 +00:00
Dianne Hackborn
3d1933c45f Implement some control over ALLOW_WHILE_IDLE alarms. 
Since these alarms allow you to bypass the idle restrictions,
we don't want them to be so open-ended like other alarms.  This
implements a policy where the alarm manager will only deliver these
types of alarms every X minutes to each application.  For this
initial implementation, X is 1 minute under normal operation and
15 minutes when in idle mode.

To do this, I needed to introduce a new internal allow-while-idle
flag for system alarms, which applications can't get, and doesn't
have these new restrictions.

Also tweaked how the alarm manager handles the alarm window, so it
doesn't change if the alarm gets rescheduld; the window is now always
what as computed based on the time when the alarm was first
given to it.

Finally, fix TimeUtils to be able to correctly print times that
are > 999 days.

Change-Id: Ibad8c6a7c14b0624b54e82267be23224b4c31e84
 2015-06-12 12:37:35 -07: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