Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,493 Commits 3 Branches 0 Tags
d1fff752bf7f28bc4e4a983bb34524113e216285
Commit Graph

48888 Commits

Author SHA1 Message Date
Dimitry Ivanov
d1fff752bf am b900e2c7: am 06f3cd8e: Merge "Make apk entry separator compliant with jar url format" into mnc-dev 
* commit 'b900e2c76d2b8b937e5e5b8534a62cbf75b2398f':
  Make apk entry separator compliant with jar url format
 2015-06-11 22:17:01 +00:00
Dmitriy Ivanov
4aad8a4c0d am ff004b9f: am 99fc7e95: Merge "Add path to native libraries inside apk" into mnc-dev 
* commit 'ff004b9f2f5d6e3fdae82548d74681e9789b8b51':
  Add path to native libraries inside apk
 2015-06-11 22:16:56 +00:00
Carlos Valdivia
e6f426a109 am fe216ddd: am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 
* commit 'fe216ddd9dc4d3589c1e6fe9eae94ec6d5a5029f':
  Revert "Revert "Permissions: Fix account related permissions.""
 2015-06-11 22:16:38 +00:00
Dimitry Ivanov
06f3cd8e8b Merge "Make apk entry separator compliant with jar url format" into mnc-dev 2015-06-11 21:55:02 +00:00
Dmitriy Ivanov
99fc7e95c5 Merge "Add path to native libraries inside apk" into mnc-dev 2015-06-11 21:55:01 +00:00
Carlos Valdivia
b3c134e161 Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 2015-06-11 21:18:03 +00:00
Ruben Brunk
353d807fd9 am 49f64f2e: am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev 
* commit '49f64f2e0a6fb3d0ab15dc04194a463412cfb1bc':
  Fix intermediate preview size selection for legacy.
 2015-06-11 21:11:48 +00:00
Yin-Chia Yeh
600bd60d7e am 990c85d0: am dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 
* commit '990c85d0c242cb2c53f0e6e90e14479236ca995b':
  Camera2: Legacy: handle FPS range properly
 2015-06-11 21:11:43 +00:00
Zheng Fu
e767c11cdc am cc7d826c: am dfd93c69: Merge "Revert contact metadata_sync constants." into mnc-dev 
* commit 'cc7d826c91c6609029178e1fd8648107697e7b1e':
  Revert contact metadata_sync constants.
 2015-06-11 21:11:25 +00:00
Adam Lesinski
3189d8db75 am 6643da95: am df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 
* commit '6643da955796231da5193c50aafcc59ff8655f7f':
  Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
 2015-06-11 21:11:21 +00:00
Carlos Valdivia
f68b581cb0 am 9c9ebccd: am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit '9c9ebccd028fecafaf36660351ce598b7ff8106c':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 21:10:55 +00:00
Jeff Sharkey
03d3aefd3e am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'a6f89a07f191c8f80d7cbce62b178f8bdc23ec18':
  Ignore some more generic USB device names.
 2015-06-11 21:10:50 +00:00
Carlos Valdivia
6eb73a5778 Revert "Revert "Permissions: Fix account related permissions."" 
This reverts commit dcddc47665.

Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe
 2015-06-11 14:10:04 -07:00
Ruben Brunk
c2b409267e Merge "Fix intermediate preview size selection for legacy." into mnc-dev 2015-06-11 20:29:28 +00:00
Yin-Chia Yeh
dba1cf3d51 Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 2015-06-11 20:29:28 +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
Chris Craik
15167d15b4 am 31f50838: am e22c59b2: Trace each stage of Choreographer driven frames 
* commit '31f50838357f8017721ba198c2cf6ddb733c378f':
  Trace each stage of Choreographer driven frames
 2015-06-11 20:05:33 +00:00
Makoto Onuki
ed5d2dc274 am cc0c8a48: am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'cc0c8a48422e0bb5a1f699fdb12d12691004fe7c':
  Fix the PFD detachFd issue.
 2015-06-11 20:05:28 +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
Yin-Chia Yeh
ec743ee9a4 Camera2: Legacy: handle FPS range properly 
Convert between the FPS range unit of API1 and API2.

Bug: 21754853
Change-Id: I823e533eeac3bf8beb7b975fe296b309300e2b05
 2015-06-11 12:57:49 -07:00
Jeff Sharkey
c8488e99e8 Merge "Ignore some more generic USB device names." into mnc-dev 2015-06-11 19:57:25 +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
2656fa065f am 415cc610: am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '415cc61096e8198e005b42a1172f103016dfc3fc':
  Selected count string needs plurals.
 2015-06-11 18:35:48 +00:00
Carlos Valdivia
2e2d22a20e am e262829d: am ffb46022: Permissions: Fix account related permissions. 
* commit 'e262829d0cb2e8117a18bc5b397daa17316acd46':
  Permissions: Fix account related permissions.
 2015-06-11 18:35:43 +00:00
Jeff Sharkey
8a26514687 Merge "Selected count string needs plurals." into mnc-dev 2015-06-11 18:21:08 +00:00
Craig Lafayette
6c5acdbc93 am 7ff09f2b: am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev 
* commit '7ff09f2be0be1ad5f9c7b9dce31084522fb30608':
  Remove device initializer status messages
 2015-06-11 18:08:58 +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
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Benjamin Franz
95b555fc90 am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev 
* commit '8b5c2e8acd01c87204ba0b842a35c625be174e5b':
  Align the behaviour of different lock task modes
 2015-06-11 16:38:36 +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
Simon Baldwin
519919b0d4 Make apk entry separator compliant with jar url format 
Bug: http://b/21726698
Bug: http://b/8076853
Change-Id: I4106dd82aeb5d7d66c9988be6e8c8726c78ae08c
 2015-06-11 17:09:49 +01:00
John Spurlock
2fd86477b1 am a03c1050: am c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 
* commit 'a03c1050e46a4bab2f1e532d295ab269e98471ac':
  Volume: Disable seekbar prefs when zen muted.
 2015-06-11 14:23:44 +00:00
John Spurlock
c110887c2a Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 2015-06-11 14:08:48 +00:00
Svet Ganov
72c9e50908 am f3dbed08: am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit 'f3dbed08df13859dee3c4b000646542c9d867615':
  Propagete document meta-data to custom print UI.
 2015-06-11 12:54:05 +00:00
Svet Ganov
392b8e0154 am 4794e300: am e545bd36: Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 
* commit '4794e3001f6a53515178d5f8069d2e0e09a87285':
  Permission group is granted if one permission is granted for UI purposes.
 2015-06-11 12:54:00 +00:00
Chris Banes
d4e6479ef7 am 0d4798be: am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit '0d4798beb9891d806c29ef8c259790bd7e9c10b6':
  API council review feedback for ActionMenuView
 2015-06-11 12:53:48 +00:00
Svetoslav
47db722168 am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '0525c07f30f08008883cf2845afa3bf81f888c55':
  Add system API to watch for permission changes
 2015-06-11 12:53:42 +00:00
Robert Greenwalt
0c3b280af0 am ac114ae0: am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev 
* commit 'ac114ae071fac3693e4694f338f5e5612f11a730':
  Add logging to help debug this issue.
 2015-06-11 12:53:16 +00:00
Svet Ganov
5772b5c671 Propagete document meta-data to custom print UI. 
Change-Id: I3f122224e1b311a222969253ae0336177989a414
 2015-06-11 03:32:09 -07:00
Svet Ganov
e545bd36a4 Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 2015-06-11 08:17:43 +00:00
Svet Ganov
1ed0e553c6 Permission group is granted if one permission is granted for UI purposes. 
bug:21761217

Change-Id: I02c78225e3883106565d304d5b268e496bca7d89
 2015-06-11 01:17:07 -07:00
Chris Banes
dbdaa9b41e Merge "API council review feedback for ActionMenuView" into mnc-dev 2015-06-11 08:05:42 +00:00
Svetoslav
75a0ee081f Merge "Add system API to watch for permission changes" into mnc-dev 2015-06-11 08:02:06 +00:00