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

53268 Commits

Author SHA1 Message Date
Navtej Singh Mann
6d8281cf6a am 0ef04dc7: am 3c0ce5ca: fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
* commit '0ef04dc7f231dc69ca89bd5be9e3a5166c270b3d':
  fix ArrayIndexOutOfBoundsException while starting WifiScannerScan
 2015-06-12 00:32:15 +00:00
Navtej Singh Mann
3c0ce5ca14 fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
bug: 21663831
Change-Id: I9aea30907aae00c98d8fb1dc1fff3f4935108fa4
 2015-06-11 17:04:15 -07:00
Dianne Hackborn
3122239a50 am 550ae6db: am 2430f47b: Merge "Add ArraySet to the SDK." into mnc-dev 
* commit '550ae6db7f888cf6431c339274973faee352a507':
  Add ArraySet to the SDK.
 2015-06-11 23:36:06 +00:00
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +00:00
Ruben Brunk
35b387f360 am 879e12a1: am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev 
* commit '879e12a14ac2bb756a3548c67ff4145a9b1aeedf':
  Set scaling mode for legacy device surfaces.
 2015-06-11 22:43:32 +00:00
Adam Lesinski
6b7d2ec164 am 9598abea: am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 
* commit '9598abea3160328bbf98ca5eb04f7b1502417469':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
 2015-06-11 22:43:20 +00:00
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
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
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
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
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
Adam Powell
8a22c78cd1 am 5c3f408c: am 98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev 
* commit '5c3f408c29451c2dff45d9d5edc4534d239d8700':
  Disable ResolverComparator's debug logging
 2015-06-11 17:40:18 +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
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