Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,882 Commits 3 Branches 0 Tags
0437422b6aec4a6029ac20e693b16bf09b3ffd2a
Commit Graph

49556 Commits

Author SHA1 Message Date
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
Przemyslaw Szczepaniak
4dcde911de am 1bb6ee4a: am 7ae22652: Merge "Fixes for API Review: android.speech.tts" into mnc-dev 
* commit '1bb6ee4a938a6d8a032f0f8947ff9a44bea999cd':
  Fixes for API Review: android.speech.tts
 2015-06-12 17:58:30 +00:00
Amith Yamasani
ffff74abb1 Merge "Report app standby state to batterystats" into mnc-dev 2015-06-12 17:52:55 +00:00
Jeff Sharkey
69353453c0 am 551ca4ff: am 05107ddf: am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev 
* commit '551ca4ffc4bdd65043277244952ba8a7a0603518':
  Annotate ContentProviderClient arguments.
 2015-06-12 17:48:29 +00:00
Dianne Hackborn
f8b3253180 am ccd6d0c1: am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit 'ccd6d0c14decd111e7e12bf9844fa5ff75aa912e':
  Fix APIs.
 2015-06-12 17:48:22 +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
551ca4ffc4 am 05107ddf: am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev 
* commit '05107ddf2069f3ea0d8ef01d20d6bc4d65addc7a':
  Annotate ContentProviderClient arguments.
 2015-06-12 17:31:46 +00:00
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
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
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Alex Klyubin
f5cb7018bc am 88fc5371: am d3f2657e: am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev 
* commit '88fc537102351f585505ec8a98f2a073e7a1d98e':
  Document that DownloadManager supports HTTPS.
 2015-06-12 16:34:14 +00:00
Alex Klyubin
88fc537102 am d3f2657e: am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev 
* commit 'd3f2657ee3655eb07d3772d6ce0b7fdbfe2cf48d':
  Document that DownloadManager supports HTTPS.
 2015-06-12 16:22:43 +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
0a488ea63d am 501209df: am 16b4e751: am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev 
* commit '501209dfc0c3bce3596998074638faaa913da174':
  Remove View.getBackgroundColor()
 2015-06-12 15:31:13 +00:00
Chet Haase
501209dfc0 am 16b4e751: am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev 
* commit '16b4e7515d49c52df9f049f40f324d714e745459':
  Remove View.getBackgroundColor()
 2015-06-12 15:16:35 +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
Tor Norbye
679ba49929 Merge "176321: Add missing @ColorRes/@ColorInt annotations" 2015-06-12 13:53:05 +00: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
a05a68d97e am 60a640f4: am 3015edb0: am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 
* commit '60a640f4152bb1587f0332d9188c884ceddabb3b':
  Reset drag accelerator state in Editor#sendOnTextChanged.
 2015-06-12 11:43:17 +00:00
Keisuke Kuroyanagi
60a640f415 am 3015edb0: am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 
* commit '3015edb01e35d35f2971af7c6c9c6cfe9a2b8b2c':
  Reset drag accelerator state in Editor#sendOnTextChanged.
 2015-06-12 11:32:59 +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
ecc685391b am d841ebb7: am c13ea212: am 5c82d2cc: Change references to APK Certificate to Signature 
* commit 'd841ebb7e714e5b15da842d9314aeb7749050402':
  Change references to APK Certificate to Signature
 2015-06-12 10:30:05 +00:00
Rubin Xu
d841ebb7e7 am c13ea212: am 5c82d2cc: Change references to APK Certificate to Signature 
* commit 'c13ea21249455708a5d1ffb42ef0a4751214c6b1':
  Change references to APK Certificate to Signature
 2015-06-12 10:17:44 +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
2f6704a5a8 am a1d8a67b: am 9b68fb74: am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 
* commit 'a1d8a67b6ff4a148d7b868c3f83fbfdb77566872':
  Sigh, some apps are sending null ContentValues.
 2015-06-12 05:28:29 +00:00
Jeff Sharkey
2b27d4fdd8 am aaf42c9e: am c69a4fc5: am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 
* commit 'aaf42c9ea0e2294fd6a4cc8b13b54d392b1424a4':
  Annotate ContentResolver/Provider arguments.
 2015-06-12 05:21:15 +00:00
Jeff Sharkey
a1d8a67b6f am 9b68fb74: am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 
* commit '9b68fb745ca26f725ae174623cc6e1183f9d9ca6':
  Sigh, some apps are sending null ContentValues.
 2015-06-12 05:15:43 +00:00
Yohei Yukawa
4c231bf412 am 16efc517: am 09259de0: Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 
* commit '16efc517be792d9aec284ae7d8cbba81027ca971':
  Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
 2015-06-12 05:15:39 +00:00
Jeff Sharkey
018913fe24 am c1a54115: am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit 'c1a54115bdf8eead6e84e776c990a567d9d3e47c':
  Valid filenames have length limits!
 2015-06-12 05:15:36 +00:00