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

48508 Commits

Author SHA1 Message Date
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +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
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
Dianne Hackborn
f16747db09 Add ArraySet to the SDK. 
Also fix some documentation.

Change-Id: I46025c3b5450e7cd671135b99ff3b298e223651d
 2015-06-11 13:53:13 -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
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
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
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
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
c110887c2a Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 2015-06-11 14:08:48 +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
Robert Greenwalt
3d68dee119 Add logging to help debug this issue. 
Shows:
TelephonyNetworkFactories:
    {TelephonyNetworkFactory - ScoreFilter=50, Filter=[ Transports:
    CELLULAR Capabilities: MMS&SUPL&DUN&FOTA&IMS&CBS&IA&RCS&XCAP&EIMS&
    INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN Specifier: <2>],
    requests=1, refCount=0}
        {NetworkRequest [ id=1, legacyType=-1, [ Capabilities:
        INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN] ], score=50, requested=true}

bug:20731384
Change-Id: I6a38f195609ad01ff2a2584d07945540ae421586
 2015-06-10 22:17:49 -07:00
Svetoslav
f7c06eb03a Add system API to watch for permission changes 
Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
 2015-06-10 21:24:13 -07:00
Jeff Brown
3c9614a03a Merge "Expose Context.getSystemServiceName()." into mnc-dev 2015-06-11 02:37:29 +00:00
Jeff Brown
5b65a36d59 Merge "Add docs for ContentProviderOperations." into mnc-dev 2015-06-11 02:32:13 +00:00
Robert Greenwalt
3cbad5c17f Merge "Remove network requests properly." into mnc-dev 2015-06-11 02:19:17 +00:00
Jeff Brown
40f58d910a Expose Context.getSystemServiceName(). 
Expose this method so that subclasses can declare new types of services
that can be returned by getSystemService(Class<T>).

Bug: 21343770
Change-Id: I08bdfa61153d19298645dc495deb2d535e54f9f0
 2015-06-10 17:47:52 -07:00
Jonathan Basseri
95120bbb6f Merge "Fix typo possibly -> possible." into mnc-dev 2015-06-11 00:44:46 +00:00
Jeff Brown
764e95ec4f Add docs for ContentProviderOperations. 
Bug: 21343769
Change-Id: Ia122b58785cf98f16664f82eb00a1f6bd9366885
 2015-06-10 17:39:29 -07:00
Ruben Brunk
c64e80ddda Fix intermediate preview size selection for legacy. 
Bug: 19606058
Change-Id: I4bf4c5bafdd5a50e46aa117b76d96381a3b82e5d
 2015-06-10 17:38:43 -07:00
Jeff Sharkey
5fc247338d New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
 2015-06-10 16:49:11 -07:00
John Spurlock
96d4a9ec39 Volume: Disable seekbar prefs when zen muted. 
- And display the last audible value.

Bug: 21267436
Change-Id: I667d0680811b48a51eab22c837933e493f1d5c44
 2015-06-10 19:04:40 -04:00
Aravind Akella
0d07846f0f Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 2015-06-10 22:56:33 +00:00
Zhijun He
1527edbcf9 Merge "Camera2: fix high speed output surface format check" into mnc-dev 2015-06-10 22:56:22 +00:00
Raph Levien
a011c7fcf7 Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 2015-06-10 22:52:33 +00:00
Aravind Akella
1b41cc9567 Use LOCATION_HARDWARE permission for data injection. 
Change-Id: I59c1e1e97a6a0457f6fc2984b214647814895cf2
 2015-06-10 15:21:03 -07:00