Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,086 Commits 3 Branches 0 Tags
d8fcc2e3599ef85514151dfec4c68c38ac89d671
Commit Graph

53384 Commits

Author SHA1 Message Date
Zhijun He
d8fcc2e359 am 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit '5e83c9080c71111955bf7e2559b453ffeb5b2c0d':
  Camera2: fix Surface cast issue
 2015-06-15 23:39:39 +00:00
John Spurlock
aa48a4f2e5 am 1e17afa7: am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '1e17afa76a76ffd1ac3c8eb9596de5513ca27c28':
  Fix typo in TtsSpan.
 2015-06-15 23:39:34 +00:00
Zhijun He
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +00:00
Ruben Brunk
cabcf6545b am 0e250edb: am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev 
* commit '0e250edbfd4f6ec1f59d73dfca4f5f806386a5e1':
  Add addional scale component for radialDistortion.
 2015-06-15 22:58:26 +00:00
John Spurlock
9f206bec2d am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '4393a7d2645cfb9097e616016c58887b9929be55':
  Fix typo in TtsSpan.
 2015-06-15 22:50:51 +00:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
 2015-06-15 22:39:12 +00:00
Ruben Brunk
9f6d39f844 Merge "Add addional scale component for radialDistortion." into mnc-dev 2015-06-15 22:34:20 +00:00
Ruben Brunk
02cd8cbc9d Add addional scale component for radialDistortion. 
Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
 2015-06-15 15:33:09 -07:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan. 
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
 2015-06-15 22:11:30 +00:00
George Mount
ac3c21140b am 1c8ff1dd: am 727a6cf6: Fix blink in Explode transition. 
* commit '1c8ff1dd32f4f6a0d94a58aecf4a44524ff4192b':
  Fix blink in Explode transition.
 2015-06-15 21:31:32 +00:00
George Mount
727a6cf6ad Fix blink in Explode transition. 
Bug 21785708

Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc
 2015-06-15 14:12:26 -07:00
George Mount
8acb658b2a am c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev 
* commit 'c28834f7786bbbd1452bf7b33b21b5e7438365e5':
  Limit shared element transition to shared elements and children.
 2015-06-15 20:07:45 +00:00
Vladislav Kaznacheev
dfa44e75d5 am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 
* commit 'a31cda89957cc1f29ae1b97a7fadf0266b7ae7b1':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-06-15 20:07:41 +00:00
Adam Powell
e032baa9fc am b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 
* commit 'b05ef5e4ef992998894b3b6b644f1ca405889bfc':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
 2015-06-15 19:49:41 +00:00
George Mount
8af7848355 Merge "Limit shared element transition to shared elements and children." into mnc-dev 2015-06-15 19:43:57 +00:00
Vladislav Kaznacheev
0021d3fa13 Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 2015-06-15 19:43:13 +00:00
Dianne Hackborn
d5111d46d6 am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '4169b6282f78a8027cc0e4c2f3ca4f0f05c57d08':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:37:15 +00:00
Adam Powell
417018f21b Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 2015-06-15 19:25:21 +00:00
Dianne Hackborn
285cb414ea Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 2015-06-15 19:12:17 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist 
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
 2015-06-15 11:53:59 -07:00
Alan Viverette
61c9ca8e9d am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '3688439287948303ad0652df69565168f4c7f2bf':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:27:47 +00:00
Alan Viverette
2d4dc8db64 Merge "Obtain handler from context in CaptioningManager" into mnc-dev 2015-06-15 18:05:11 +00:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan. 
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
 2015-06-15 17:24:57 +00:00
Zhijun He
42499640cc Camera2: fix Surface cast issue 
Can not cast an object array directly to a Surface array.

Change-Id: Ie2cb711f9e1ff0fc17d6038992dc3c7af9471ccf
 2015-06-15 09:43:55 -07:00
Vladislav Kaznacheev
78f146f420 Revert "Make VPA.setInterpolator(null) unset the interpolator." 
This reverts commit 8cebf3a098.

Bug: 21804709
Change-Id: I4b3c2c4721b8e7dd5cb38c806bdd078344b09799
 2015-06-15 06:58:59 +00:00
Svetoslav
13fb33535f am 281c8389: am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '281c8389bcc50554496d525124338b1f7264525f':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:23:44 +00:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Svet Ganov
d85e7d06e0 am 174b86de: am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit '174b86dede42cf63c99d16f32f312069e9c74634':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:36:18 +00:00
Svet Ganov
715cf2ac0b Make AppOpsManager#permissionToOp API public 
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
 2015-06-14 00:50:38 +00:00
Jim Miller
c425e57014 am b3957fbd: am 1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev 
* commit 'b3957fbd9b7f12881a781529fb957aebba752feb':
  Improve LockPatternView accessibility
 2015-06-13 01:29:01 +00:00
Jim Miller
1035833fc6 Merge "Improve LockPatternView accessibility" into mnc-dev 2015-06-13 01:10:21 +00:00
Makoto Onuki
ed96008017 am 5a9ef04f: am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit '5a9ef04f032933ddc45611ff598f74273d9bccda':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 00:53:55 +00:00
Makoto Onuki
bd25b5f602 Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 2015-06-13 00:28:20 +00:00
Makoto Onuki
34bdcdb105 Fix ArrayIndexOutOfBoundsException in Transport.query 
The bug was that it used getCount() instead of getColumnCount().

Bug 21727804

Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
 2015-06-12 17:16:23 -07:00
Makoto Onuki
92177ad765 am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit 'b3be7c26977ecebd9efd899ae5ef39e0552785aa':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:16:16 +00:00
Ruben Brunk
03d4cdec71 am 38998eaf: am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '38998eaf6c6e27d2155c24aab895baa93af775a7':
  Fix rounding width.
 2015-06-12 23:57:25 +00:00
Makoto Onuki
80b34d7b9d Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 2015-06-12 23:56:10 +00:00
Adam Lesinski
f667a062e9 am 30ad8de5: am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 
* commit '30ad8de51fd6f03b4fd92dd4957e3a3ff0bc6e84':
  App Standby: Convert constants to Settings.Global
 2015-06-12 23:39:30 +00:00
Jeff Sharkey
ed54749669 am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit 'e4872995224bca8371188d1b07e58871cc2aed7b':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:39:25 +00:00
Adam Lesinski
f038059208 am c32eec37: am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit 'c32eec37908a4d45c82bc4984fd9b68cb25949a8':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:39:21 +00:00
Ruben Brunk
8491d2dea9 Merge "Fix rounding width." into mnc-dev 2015-06-12 23:34:51 +00:00
Adam Lesinski
cd9d7b7b07 Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 2015-06-12 23:20:28 +00:00
Jeff Sharkey
1d04e6a6cd Merge "More useful extras in disk/volume broadcasts." into mnc-dev 2015-06-12 23:19:34 +00:00
Adam Lesinski
a6232df053 App Standby: Convert constants to Settings.Global 
Use settings instead of hardcoded constants, and listen for their changes.

Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
 2015-06-12 16:19:07 -07:00
Adam Lesinski
87a79c394d Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 2015-06-12 23:17:47 +00:00
Jeff Sharkey
c7acac6798 More useful extras in disk/volume broadcasts. 
Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
 2015-06-12 16:16:56 -07:00
Ruben Brunk
68e4fc8ca9 Fix rounding width. 
Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
 2015-06-12 16:16:42 -07:00
Adam Lesinski
57123001a4 BatteryStatsHelper: Fix some lost power 
Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.

Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.

Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
 2015-06-12 16:12:07 -07:00
Makoto Onuki
9dc575d63c Add StorageEventListener.onDiskDestroyed() 
Bug 21336042

Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
 2015-06-12 16:11:46 -07:00
Ruben Brunk
6eaad329a9 am a43b5061: am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev 
* commit 'a43b50613d1457ae588a849d5c99428c62c45ef7':
  Fix legacy disconnect callback.
 2015-06-12 22:43:32 +00:00