Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,642 Commits 3 Branches 0 Tags
3cf006a0ce8357b580bc2ec2f82998045700dd4e
Commit Graph

42291 Commits

Author SHA1 Message Date
Lorenzo Colitti
3cf006a0ce am 1b3c16a0: am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit '1b3c16a06a43e98de8341535003b4d8fba2ba08a':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 16:22:01 +00:00
Ruben Brunk
a0006633ff am e39469e5: am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit 'e39469e500de0d5ef1845d3f6c01b99adb835390':
  camera2: Docs update for available AF modes.
 2014-09-23 16:21:27 +00:00
Ruben Brunk
95bd128b3f am 64e0b657: am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '64e0b657df23f612875d0fae204e6c3291fdc9e6':
  camera2: Add missing whitebalance mapping.
 2014-09-23 16:21:23 +00:00
Alan Viverette
2eeaba6252 am 49a20330: am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '49a20330f238fb9e72c5ad32d35c1147ccebaf9b':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 16:21:18 +00:00
Ruben Brunk
ab204faaf7 am d3894f50: am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit 'd3894f50bd04de40fb09b24ca6f4a05a4e954c0f':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 16:21:13 +00:00
John Reck
0110911b38 am 316ad883: am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '316ad883b5d5a37c4d39c328e9acb2995403337b':
  Aggressively trim memory for system_process
 2014-09-23 16:20:58 +00:00
Wink Saville
8c437b99d4 am 5530638d: am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev 
* commit '5530638d98085ddcbd538809e9c12f4b9102de09':
  Cleanup NetworkCapabilities.
 2014-09-23 16:20:48 +00:00
John Spurlock
8f2cf915a7 am 3b828d21: am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit '3b828d215f7acaf9d5f12826f58e9c7caa2055f0':
  Zen: Add events as a new config attribute.
 2014-09-23 16:19:53 +00:00
Przemyslaw Szczepaniak
1641693113 am 2a94d26f: am 949ea9f0: am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API 
* commit '2a94d26fc3b13ea89412ddac4f1b83f29b9244b8':
  Fix issues with new TTS API
 2014-09-23 16:16:44 +00:00
Ruben Brunk
9d3e024267 am 03e4e0a3: am 3d608a42: am d314f286: am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit '03e4e0a3aa7cead96c21d86c64e188836f8fee74':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-23 16:16:28 +00:00
Ruben Brunk
c539813a19 am 5ad61b7b: am f1a9ccb5: am 6e13d7fd: am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '5ad61b7b16ae63baf58b9f5a1c459a4a69eaa5be':
  camera2: refactor LEGACY mode error handling.
 2014-09-23 16:16:08 +00:00
Svetoslav
b7e80d961f am e9ff6bb4: am 20178a82: am 35c764cf: am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit 'e9ff6bb4c1f77661de9fea02c28b3b80aed1b393':
  Fix memory leak in accessibility cache.
 2014-09-23 16:15:54 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 15:51:32 +00:00
Ruben Brunk
0498c04857 am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '04ddd954e3ccad653441762d1f289b2945dc061e':
  camera2: Docs update for available AF modes.
 2014-09-23 15:50:33 +00:00
Ruben Brunk
79a7e78c0d am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit 'b95f6de6a4b23b7e95c61446f4879dbedf444156':
  camera2: Add missing whitebalance mapping.
 2014-09-23 15:50:27 +00:00
Alan Viverette
a83de9cf9d am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8 am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 15:49:58 +00:00
John Reck
5315ce4bf1 am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7':
  Aggressively trim memory for system_process
 2014-09-23 15:49:41 +00:00
Wink Saville
2ed12a198f am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev 
* commit 'd428d7bf62be4dbe39489947eaea98f6fc933e08':
  Cleanup NetworkCapabilities.
 2014-09-23 15:49:08 +00:00
Lorenzo Colitti
633b7bb8ed am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:21:21 +00:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev 
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 01:46:48 +00:00
Ruben Brunk
e48fcfb38f am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
  camera2: Docs update for available AF modes.
 2014-09-23 00:16:01 +00:00
Ruben Brunk
fcb086c8e7 Merge "camera2: Docs update for available AF modes." into lmp-dev 2014-09-23 00:06:15 +00:00
Ruben Brunk
75192fb790 am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:03:49 +00:00
Alan Viverette
60004caeba am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-22 23:58:31 +00:00
Ruben Brunk
9343c3cb7f Merge "camera2: Add missing whitebalance mapping." into lmp-dev 2014-09-22 23:57:20 +00:00
Alan Viverette
53b5cc8773 Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 2014-09-22 23:48:46 +00:00
Ruben Brunk
524d16f7eb am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '979c03a21bc346ddbfbfcf5d1d4239e5cdf30302':
  camera2: Avoid spurious IDLE transitions.
 2014-09-22 23:29:55 +00:00
Alan Viverette
fde4e3b17a Fix inaccurate TypedArray.getDrawable() documentation 
The documentation implied that you could override
Resources.getDrawable(int) to load custom drawables, which is
not the case.

BUG: 16635905
Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
 2014-09-22 16:19:51 -07:00
Ruben Brunk
c90b5ebbbf Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 2014-09-22 23:19:46 +00:00
Ruben Brunk
6f387098c2 camera2: Docs update for available AF modes. 
Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
 2014-09-22 16:13:54 -07:00
John Reck
6ed5ffebce am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '668e566ec250a9548d6201c6190f80306e91dcce':
  Aggressively trim memory for system_process
 2014-09-22 23:10:37 +00:00
John Reck
c1dab7a201 Merge "Aggressively trim memory for system_process" into lmp-dev 2014-09-22 23:05:02 +00:00
John Reck
73840ea367 Aggressively trim memory for system_process 
Bug: 16978006

Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.

Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
 2014-09-22 16:01:56 -07:00
Ruben Brunk
72a23d7b50 camera2: Add missing whitebalance mapping. 
Bug: 17588192
Change-Id: I5d161dd22f2057a33a461157d678d4217a5f88f8
 2014-09-22 15:59:50 -07:00
Wink Saville
4e2dea77dc Cleanup NetworkCapabilities. 
Remove unused imports and variables.
Fix misspellings.
Added @Overrides.

Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e
 2014-09-22 21:51:47 +00:00
John Spurlock
04b64cd0a4 am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit '91c77f044b07df9c84529296c9bd01b374e894f9':
  Zen: Add events as a new config attribute.
 2014-09-22 21:51:13 +00:00
John Spurlock
37486e54d7 am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit 'c018af27d9da4ee3d7dc79103ff35eb54f80a8de':
  Zen: Add events as a new config attribute.
 2014-09-22 21:15:32 +00:00
John Spurlock
e35c9bf9ba Merge "Zen: Add events as a new config attribute." into lmp-dev 2014-09-22 21:09:39 +00:00
John Spurlock
2dac62c2e9 Zen: Add events as a new config attribute. 
Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.

Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
 2014-09-22 16:44:37 -04:00
Przemyslaw Szczepaniak
c2ece0002b am 949ea9f0: am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API 
* commit '949ea9f011ee3577a6a73c6181185bd01f041597':
  Fix issues with new TTS API
 2014-09-22 19:45:23 +00:00
Ruben Brunk
436257113b am 3d608a42: am d314f286: am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit '3d608a420b65a9ba068d11b146ac7fc6a7464092':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 19:45:08 +00:00
Ruben Brunk
55dbaf72fe am f1a9ccb5: am 6e13d7fd: am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit 'f1a9ccb55ea9ecc4de90766c77bb81c5cfd0af12':
  camera2: refactor LEGACY mode error handling.
 2014-09-22 19:44:49 +00:00
Svetoslav
41f5dbe776 am 20178a82: am 35c764cf: am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '20178a82310253e12555c783e0e3efde8b0500ac':
  Fix memory leak in accessibility cache.
 2014-09-22 19:44:35 +00:00
Przemyslaw Szczepaniak
8977eae6db am 299bb1fb: Fix issues with new TTS API 
* commit '299bb1fbc62ab8d6e1389cb2959e093e217f8c79':
  Fix issues with new TTS API
 2014-09-22 17:55:56 +00:00
Przemyslaw Szczepaniak
f9ba548f21 Fix issues with new TTS API 
Bug: 17389935
Change-Id: I59234b3222f59dc89be7e40f7d4706b1f8c610ce
 2014-09-22 17:39:16 +01:00
Lorenzo Colitti
4b0f8e6fb7 Support non-unicast route types: unreachable and throw. 
Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
 2014-09-22 13:10:15 +09:00
Ruben Brunk
8aa88195fe am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit '3b57d98a1a84ce063cb3681cae10795216300035':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 03:43:23 +00:00
Ruben Brunk
4aed87a9ed camera2: Avoid spurious IDLE transitions. 
Bug: 17594247

- Avoid spurious IDLE transitions when waiting for
  prior requests to complete.
- Clean up error reporting for GL thread and CameraDeviceState.
- Add error handling for Camera1 ErrorCallback calls.

Change-Id: I72850251d8965139b6db2193e91483a3d3409b7c
 2014-09-21 20:09:38 -07:00
Ruben Brunk
97b5301b09 camera2: Avoid setting null metering regions in LEGACY. 
Bug: 17587491

- If a single region with zero weight is set, revert to default
  metering region rather than attempting to set a null to
  avoid setParameters failure.

Change-Id: Iccd4d53d5a2134a9d744eafb731f464b653a154d
 2014-09-21 16:09:34 -07:00