Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,180 Commits 3 Branches 0 Tags
68ae7b3d234c262cfdf123cbdd08cb9cd40b08aa
Commit Graph

49591 Commits

Author SHA1 Message Date
Alan Viverette
68ae7b3d23 am 61c9ca8e: am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '61c9ca8e9dc6613a9256cccee947e32a74490cfa':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:42:52 +00:00
Alan Viverette
61c9ca8e9d am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '3688439287948303ad0652df69565168f4c7f2bf':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:27:47 +00:00
Alan Viverette
2d4dc8db64 Merge "Obtain handler from context in CaptioningManager" into mnc-dev 2015-06-15 18:05:11 +00:00
Svetoslav
f8d6ce6aab am 13fb3353: am 281c8389: am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '13fb33535f93c8cd49650b398f5728938f90933b':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:34:52 +00:00
Svetoslav
13fb33535f am 281c8389: am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '281c8389bcc50554496d525124338b1f7264525f':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:23:44 +00:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Svet Ganov
d01f446085 am d85e7d06: am 174b86de: am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit 'd85e7d06e0cb6b0cbafa53536ec9a817c1fa6068':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:47:33 +00:00
Svet Ganov
d85e7d06e0 am 174b86de: am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit '174b86dede42cf63c99d16f32f312069e9c74634':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:36:18 +00:00
Svet Ganov
715cf2ac0b Make AppOpsManager#permissionToOp API public 
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
 2015-06-14 00:50:38 +00:00
Makoto Onuki
b3dcb74c69 am ed960080: am 5a9ef04f: am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit 'ed9600801733b3481a3ede9af94d2129620a348e':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 01:06:22 +00:00
Makoto Onuki
ed96008017 am 5a9ef04f: am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit '5a9ef04f032933ddc45611ff598f74273d9bccda':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 00:53:55 +00:00
Makoto Onuki
a84fc38bdf am 92177ad7: am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit '92177ad765b86f77e86a29e9d013883af9fec134':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:29:45 +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
92177ad765 am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit 'b3be7c26977ecebd9efd899ae5ef39e0552785aa':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:16:16 +00:00
Ruben Brunk
6598d782a5 am 03d4cdec: am 38998eaf: am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '03d4cdec71dc7b39970106887e1313f4e67c0823':
  Fix rounding width.
 2015-06-13 00:13:36 +00:00
Ruben Brunk
03d4cdec71 am 38998eaf: am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '38998eaf6c6e27d2155c24aab895baa93af775a7':
  Fix rounding width.
 2015-06-12 23:57:25 +00:00
Makoto Onuki
80b34d7b9d Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 2015-06-12 23:56:10 +00:00
Adam Lesinski
7efeb10f6f am f667a062: am 30ad8de5: am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 
* commit 'f667a062e91e0312af1267ee08a6ce9472510379':
  App Standby: Convert constants to Settings.Global
 2015-06-12 23:52:34 +00:00
Jeff Sharkey
76e0067158 am ed547496: am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit 'ed547496691b65ae45252aee9471fb36b39bacc3':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:52:28 +00:00
Adam Lesinski
3079bd42f5 am f0380592: am c32eec37: am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit 'f03805920880c007b443a8a3a0c60efcfc396dc4':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:52:23 +00:00
Adam Lesinski
f667a062e9 am 30ad8de5: am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 
* commit '30ad8de51fd6f03b4fd92dd4957e3a3ff0bc6e84':
  App Standby: Convert constants to Settings.Global
 2015-06-12 23:39:30 +00:00
Jeff Sharkey
ed54749669 am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit 'e4872995224bca8371188d1b07e58871cc2aed7b':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:39:25 +00:00
Adam Lesinski
f038059208 am c32eec37: am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit 'c32eec37908a4d45c82bc4984fd9b68cb25949a8':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:39:21 +00:00
Ruben Brunk
8491d2dea9 Merge "Fix rounding width." into mnc-dev 2015-06-12 23:34:51 +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
0437422b6a am 6eaad329: am a43b5061: am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev 
* commit '6eaad329a9bbd442932f09db1fe21443c8cfc34a':
  Fix legacy disconnect callback.
 2015-06-12 22:56:08 +00:00
Ruben Brunk
6eaad329a9 am a43b5061: am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev 
* commit 'a43b50613d1457ae588a849d5c99428c62c45ef7':
  Fix legacy disconnect callback.
 2015-06-12 22:43:32 +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
208233ed3f am 2712ce94: am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev 
* commit '2712ce948a9ab6f0ddb7945432f2807933c8b397':
  Implement some control over ALLOW_WHILE_IDLE alarms.
 2015-06-12 20:05:55 +00:00
Chris Wren
ac3dd4d076 am 604f6cf1: am 63cae6c8: am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev 
* commit '604f6cf11307f1be19fad05c40482fd792ab3162':
  remove usage of deprecated method setLatestEventInfo
 2015-06-12 20:05:49 +00:00
Dianne Hackborn
2712ce948a am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev 
* commit '6e2fb78fbe3ce50182f0ad928748aeada57a44cf':
  Implement some control over ALLOW_WHILE_IDLE alarms.
 2015-06-12 19:54:28 +00:00
Chris Wren
604f6cf113 am 63cae6c8: am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev 
* commit '63cae6c8caa77b6b1cdc45423ed6ec771f6c485b':
  remove usage of deprecated method setLatestEventInfo
 2015-06-12 19:54:23 +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
ecee2287e8 am b8fd9182: am 23d5a49b: am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 
* commit 'b8fd9182d63d0b9d7e80bca17c26d83ab9a40be0':
  Update doc of ACTION_PROVISION_MANAGED_DEVICE
 2015-06-12 19:06:39 +00:00
Rubin Xu
b8fd9182d6 am 23d5a49b: am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 
* commit '23d5a49bf3a36f0431154ecc4d8776a3d44e94d0':
  Update doc of ACTION_PROVISION_MANAGED_DEVICE
 2015-06-12 18:54:19 +00:00
Amith Yamasani
700a1b9f8a am db589a3d: am dc0df828: am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev 
* commit 'db589a3d0dff105f80672ad541a096d9b60e2520':
  Report app standby state to batterystats
 2015-06-12 18:30:48 +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
db589a3d0d am dc0df828: am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev 
* commit 'dc0df828a2d93828696cf6b09e02de0af5717cb4':
  Report app standby state to batterystats
 2015-06-12 18:17:58 +00:00
Przemyslaw Szczepaniak
d16d56d451 am 4dcde911: am 1bb6ee4a: am 7ae22652: Merge "Fixes for API Review: android.speech.tts" into mnc-dev 
* commit '4dcde911de4bad05f1a9eddf5719f890496d76b8':
  Fixes for API Review: android.speech.tts
 2015-06-12 18:11:47 +00:00