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

48771 Commits

Author SHA1 Message Date
Zheng Fu
ad1ecb22b2 am dfd93c69: Merge "Revert contact metadata_sync constants." into mnc-dev 
* commit 'dfd93c69c08bf0bd0c7a631b27c50a51096c9727':
  Revert contact metadata_sync constants.
 2015-06-11 20:30:14 +00:00
Adam Lesinski
71e5e13072 am df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 
* commit 'df85c12ba5eaa81a064eb8a837f3d2e8a110a3c8':
  Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
 2015-06-11 20:30:00 +00:00
Zheng Fu
dfd93c69c0 Merge "Revert contact metadata_sync constants." into mnc-dev 2015-06-11 20:24:59 +00:00
Adam Lesinski
df85c12ba5 Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 2015-06-11 20:24:31 +00:00
Carlos Valdivia
c74a99fe5f am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit 'd0041e5f474f4e795d6bc9e5eeaec4098949897c':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 20:11:57 +00:00
Jeff Sharkey
2b8a181dc1 am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'c8488e99e85ae5252e6078c00d123f1364aef25d':
  Ignore some more generic USB device names.
 2015-06-11 20:07:02 +00:00
Carlos Valdivia
d0041e5f47 Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 2015-06-11 20:04:44 +00:00
Carlos Valdivia
dcddc47665 Revert "Permissions: Fix account related permissions." 
This reverts commit ffb46022b3.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
 2015-06-11 20:04:04 +00:00
Chris Craik
7cdc8cecfb am e22c59b2: Trace each stage of Choreographer driven frames 
* commit 'e22c59b2913578c24e86673576d009d34306f6be':
  Trace each stage of Choreographer driven frames
 2015-06-11 20:01:43 +00:00
Jeff Sharkey
c8488e99e8 Merge "Ignore some more generic USB device names." into mnc-dev 2015-06-11 19:57:25 +00:00
Makoto Onuki
3b28ab10cf am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'bf2ccf9455619ac8593319cf5814f2c665656c5e':
  Fix the PFD detachFd issue.
 2015-06-11 19:55:22 +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
Chris Craik
e22c59b291 Trace each stage of Choreographer driven frames 
bug:21374535

Change-Id: I332dac216defbc4517441e2a9cdffdf71731f1e6
 2015-06-11 19:51:38 +00:00
Makoto Onuki
bf2ccf9455 Merge "Fix the PFD detachFd issue." into mnc-dev 2015-06-11 19:39:17 +00:00
Makoto Onuki
b30ad6f5e8 Fix the PFD detachFd issue. 
Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703
 2015-06-11 12:34:22 -07:00
Adam Lesinski
31c05d1361 Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants 
This will allow gservices to tweak the settings and experiment
with different values for various doze constants.

The values are encoded in a string as a key=value list. Ex:

inactive_to=5000,idle_factor=0.01

Bug:21640379
Change-Id: Ie98a0e4893f9b46a64d961d6c5c5169b8b8ad742
 2015-06-11 12:30:47 -07:00
Jeff Sharkey
d756820566 am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '8a26514687ccf651eb73d5acdd3ae7c62d247d97':
  Selected count string needs plurals.
 2015-06-11 18:31:15 +00:00
Carlos Valdivia
1af6b07091 am ffb46022: Permissions: Fix account related permissions. 
* commit 'ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814':
  Permissions: Fix account related permissions.
 2015-06-11 18:25:19 +00:00
Jeff Sharkey
8a26514687 Merge "Selected count string needs plurals." into mnc-dev 2015-06-11 18:21:08 +00:00
Carlos Valdivia
ffb46022b3 Permissions: Fix account related permissions. 
Requires updating the docs in AccountManaager as well as the logic in
AccountManagerService.

MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going
away. Where AUTHENTCATE_ACCOUNTS was required we now do signature
matching.

GET_ACCOUNTS is kept but has been grouped under contacts.

Bug: 20136477
Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481
 2015-06-11 11:07:47 -07:00
Craig Lafayette
3c796eaf66 am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev 
* commit '77b2d49abb38fafb91fb99ce603a92f189553cd7':
  Remove device initializer status messages
 2015-06-11 17:57:29 +00:00
Benjamin Franz
12f73c3b03 am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev 
* commit 'd168d184c02c33863b4eda56fae431437f609e2c':
  Align the behaviour of different lock task modes
 2015-06-11 17:56:07 +00:00
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Jeff Sharkey
f491c72e4a Selected count string needs plurals. 
Bug: 21717427
Change-Id: Ie0db8ac30244b022ca5838969fb085230bfc4499
 2015-06-11 09:19:37 -07:00
Benjamin Franz
d168d184c0 Merge "Align the behaviour of different lock task modes" into mnc-dev 2015-06-11 16:15:37 +00:00
John Spurlock
ef24170ddb am c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 
* commit 'c110887c2ad9de1de5154ac67740c6a0860fa016':
  Volume: Disable seekbar prefs when zen muted.
 2015-06-11 15:59:05 +00:00
Svet Ganov
1216ce6a72 am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit '5772b5c671a13d9c4bbc1e3803667166f811cb33':
  Propagete document meta-data to custom print UI.
 2015-06-11 15:58:38 +00:00
Svet Ganov
20a6f9866f am e545bd36: Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 
* commit 'e545bd36a483b51ef681ea063f7bda9352adb4d4':
  Permission group is granted if one permission is granted for UI purposes.
 2015-06-11 15:58:33 +00:00
Chris Banes
bf82d7c198 am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit 'dbdaa9b41e418437ec29f7ea2fa27b859b3bef14':
  API council review feedback for ActionMenuView
 2015-06-11 15:58:21 +00:00
Svetoslav
235429f652 am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '75a0ee081fa31b75649e164a8bf79a23a3ebd060':
  Add system API to watch for permission changes
 2015-06-11 15:58:00 +00:00
Robert Greenwalt
6917d2e943 am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev 
* commit 'c34f2f15df2030bc8c4865210da3bcbba46116bb':
  Add logging to help debug this issue.
 2015-06-11 15:57:36 +00:00
Jeff Brown
f56be2d139 am 3c9614a0: Merge "Expose Context.getSystemServiceName()." into mnc-dev 
* commit '3c9614a03a40c3590b38eed71f86c24d81c6d52a':
  Expose Context.getSystemServiceName().
 2015-06-11 15:56:34 +00:00
Jeff Brown
6ae596f59b am 5b65a36d: Merge "Add docs for ContentProviderOperations." into mnc-dev 
* commit '5b65a36d59a5ca09dc12c22c8b2f8dc50e3b4fbb':
  Add docs for ContentProviderOperations.
 2015-06-11 15:56:28 +00:00
Robert Greenwalt
c8d5aa18af am 3cbad5c1: Merge "Remove network requests properly." into mnc-dev 
* commit '3cbad5c17f8f8312f5e87e528f6094b60fddc440':
  Remove network requests properly.
 2015-06-11 15:56:23 +00:00
Jonathan Basseri
a01bd2db3a am 95120bbb: Merge "Fix typo possibly -> possible." into mnc-dev 
* commit '95120bbb6fb8d36d52e32d6d8d5435fc92318ca7':
  Fix typo possibly -> possible.
 2015-06-11 15:55:04 +00:00
Jeff Sharkey
961e86e691 am 5fc24733: New strings! 
* commit '5fc247338dfc1a817f708163201cdf395cff3303':
  New strings!
 2015-06-11 15:54:03 +00:00
Aravind Akella
b260a72925 am 0d07846f: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 
* commit '0d07846f0f111bc7afa5a153aa67a12022263a38':
  Use LOCATION_HARDWARE permission for data injection.
 2015-06-11 15:52:01 +00:00
Zhijun He
c738cdce45 am 1527edbc: Merge "Camera2: fix high speed output surface format check" into mnc-dev 
* commit '1527edbcf93bac258d384da3d0007c810856ea4e':
  Camera2: fix high speed output surface format check
 2015-06-11 15:51:49 +00:00
Raph Levien
31e61ba355 am a011c7fc: Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 
* commit 'a011c7fcf750e25038eb5862f41e883fef1f54f7':
  Fix documentation of nextSpanTransition off by one
 2015-06-11 15:51:38 +00:00
Vladislav Kaznacheev
57b3ff3ce3 am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev 
* commit '1955ee57b3210d9027e1c46731cf1f44406166da':
  Make VPA.setInterpolator(null) unset the interpolator.
 2015-06-11 15:42:31 +00:00
Alan Viverette
c7e86be82d am 2964c7b8: Merge "Update seek bar dialog preference for Material" into mnc-dev 
* commit '2964c7b8af15571e2967622eac0161c065880b3c':
  Update seek bar dialog preference for Material
 2015-06-11 15:41:11 +00:00
Jun Mukai
a9d1aff2a5 am b3aa575e: Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 
* commit 'b3aa575e3b8ec8f685c7431259f49ad82f2ee928':
  Specifies the new height/width for update() on ListPopupWindow.show().
 2015-06-11 15:40:44 +00:00
Nick Kralevich
3e14e33235 am 5ac4a5fa: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit '5ac4a5fa38fe1bea0007235840fb77ba3648a1d3':
  Fix USB access control when adb is disabled.
 2015-06-11 15:40:39 +00:00
Adam Lesinski
7ed56c46f6 am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 
* commit '3d53a26d1a8471f4709b528686601381fd7e6da4':
  Add more blaming output to batterystats dumpsys
 2015-06-11 15:39:48 +00:00
Jason Monk
0a2f637531 am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev 
* commit '253ee76dd9da2cda043d113f247b3c8acf915d77':
  Add action for reaching ignore battery optimizations
 2015-06-11 15:39:43 +00:00
Robin Lee
5b69aefb1b am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 
* commit '8bbbcd3d5402285b05db64c3ffd3a959f26ad16c':
  Policy: make bulk CA uninstalls happen in service
 2015-06-11 15:39:33 +00:00
Jeff Brown
38fc805459 am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev 
* commit '4bc5054040c84e5d0e97357a30faab30ce4c5441':
  Support 4K overlay displays.
 2015-06-11 15:39:09 +00:00
Ben Kwa
2d5c9c368e am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 
* commit 'c783a5e762b0c4925756b8ca273eb26aab5e7985':
  Enable apps to exclude their own roots from the DocumentsUI roots list.
 2015-06-11 15:38:09 +00:00
John Reck
a23a87f7cd am 767ec843: Merge "Set the right reportNextDraw" into mnc-dev 
* commit '767ec84354d97624b2b848c8a0b8877d87ebb5eb':
  Set the right reportNextDraw
 2015-06-11 14:53:11 +00:00
Dan Sandler
b26c1dc4ff am 382225af: Merge "Null check when reconstituting legacy icon data." into mnc-dev 
* commit '382225af479964a1677a76fe8d8f69d577ddb912':
  Null check when reconstituting legacy icon data.
 2015-06-11 14:53:04 +00:00