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

53034 Commits

Author SHA1 Message Date
Ruben Brunk
1f29544cbb am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev 
* commit 'dcb9e169d7b37d62112c25c65da54c2b92651f9f':
  Set scaling mode for legacy device surfaces.
 2015-06-11 22:27:45 +00:00
Adam Lesinski
5e3394fe1e am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 
* commit '2e49bfa6f02a4ab831a43453231888aa6d9c4ce1':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
 2015-06-11 22:22:57 +00:00
Ruben Brunk
dcb9e169d7 Merge "Set scaling mode for legacy device surfaces." into mnc-dev 2015-06-11 22:15:58 +00:00
Ruben Brunk
a94c603345 Set scaling mode for legacy device surfaces. 
Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218
 2015-06-11 15:15:17 -07:00
Dimitry Ivanov
1a2584d864 am 06f3cd8e: Merge "Make apk entry separator compliant with jar url format" into mnc-dev 
* commit '06f3cd8e8b03786851cc6c9b79487c9c8516e883':
  Make apk entry separator compliant with jar url format
 2015-06-11 22:14:58 +00:00
Dmitriy Ivanov
9410b1f069 am 99fc7e95: Merge "Add path to native libraries inside apk" into mnc-dev 
* commit '99fc7e95c51c662e8ac1e6cb00e9051a34127b92':
  Add path to native libraries inside apk
 2015-06-11 22:14:52 +00:00
Carlos Valdivia
149b3efd29 am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 
* commit 'b3c134e1614e02471811a43d12bedcfc5778667b':
  Revert "Revert "Permissions: Fix account related permissions.""
 2015-06-11 22:13:44 +00:00
Adam Lesinski
2e49bfa6f0 Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 2015-06-11 22:02:37 +00:00
Adam Lesinski
c8e8729244 UsageStats: Change INTERACTION to SYSTEM_INTERACTION 
SYSTEM_INTERACTION events are signals to the system for a package's
implicit actions (service bound, etc).

These should not affect the API visible stats like lastTimeUsed, etc.
USER_INTERACTION is for user initiated actions (notification interaction, etc).

Bug:21761781
Change-Id: I4585cf35fbb158612a3c737710108bec34e89183
 2015-06-11 22:01:45 +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
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
d2481f8960 am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev 
* commit 'c2b409267e1d9b99d4357d566291fcb9a2e88464':
  Fix intermediate preview size selection for legacy.
 2015-06-11 20:37:17 +00:00
Yin-Chia Yeh
240718ca10 am dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 
* commit 'dba1cf3d515b382e997a5a0e50b50215e3f65f9e':
  Camera2: Legacy: handle FPS range properly
 2015-06-11 20:37:11 +00:00
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
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
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
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
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
Adam Powell
2f318dd731 am 98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev 
* commit '98b40aac8399d8befc5099955a34ce54df477d8f':
  Disable ResolverComparator's debug logging
 2015-06-11 17:57:07 +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
Adam Powell
98b40aac83 Merge "Disable ResolverComparator's debug logging" into mnc-dev 2015-06-11 17:14:04 +00:00
Adam Powell
064139434d Disable ResolverComparator's debug logging 
Change-Id: Ic1df5a7caaadf7076436cbcec6e79bb14ffa1c81
 2015-06-11 10:08:03 -07: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
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