Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
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
George Mount
18166210eb am 50c7bf74: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '50c7bf74025fcf3727488e739eeec0ec1092c89b':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:44:59 +00:00
George Mount
004b7a3f19 am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:33:08 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +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
e99be2ead8 am a4695b30: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'a4695b308223cd57cc99ec86d69c95b866504e78':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:06:49 +00:00
Ruben Brunk
e3d89f1a87 am 7facb2a6: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '7facb2a66781fcad0f1bcd9dc519d49786fd95c9':
  camera2: Docs update for available AF modes.
 2014-09-23 02:53:09 +00:00
Ruben Brunk
bd2a4887f4 am 2a59f748: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '2a59f7488e7ad070b9c7553b22b5d0c28ea99f1c':
  camera2: Add missing whitebalance mapping.
 2014-09-23 02:53:02 +00:00
Alan Viverette
3343c4dcee am 7b686bd8: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '7b686bd8c6a1c06d262c4fa44c122a6e8f3d68b8':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 02:52:57 +00:00
Ruben Brunk
36dd2f3c91 am 2ccdbbe2: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '2ccdbbe29f5a58c32375633f3f3c218ecf45b24d':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 02:52:35 +00:00
John Reck
7a5b01bc0e am 01b5cfaa: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '01b5cfaac7e72526d145b4c5ea706993321abaa9':
  Aggressively trim memory for system_process
 2014-09-23 02:52:16 +00:00
Lorenzo Colitti
60446165d8 Block address families with routes, not NetworkAgent side channel 
Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e
 2014-09-23 10:48:28 +09: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
Adam Powell
744beffb6a Track persistent nested Y offset for fling velocity 
Track the nested offsets applied persistently in AbsListView and
ScrollView. This allows accurate velocity to be reported to nested
fling/pre-fling.

Bug 17548219

Change-Id: I66199c534aca7fb81746eff6d04c931e4c4e48da
 2014-09-22 17:18:42 -07: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
George Mount
f1abef6fc2 Force transitioning views to be visible when transition interrupted. 
Bug 17553034

When an Activity Transition was interrupted prior to starting the
enter transition, the views were not being made visible.

Override the return ActivityOptions if interrupted so that the
entering activity doesn't launch with a transition when coming
back from recents.

Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
 2014-09-22 17:06:24 -07: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
jgu21
2eacd06bfb Frameworks/base: Early init native bridge 
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
 2014-09-22 16:04:37 -07: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
4b6a38e92c am bb2437ab: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit 'bb2437abc8705a3fbd8d06593a5b8ae3b591bc72':
  Zen: Add events as a new config attribute.
 2014-09-22 21:26:29 +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
Alan Viverette
e69028b5de am be2fb16c: am 8ae47443: am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit 'be2fb16c0c96cea50a83560ffb198e281095842d':
  Pass explicit null theme when preloading drawables
 2014-09-22 20:02:12 +00:00
Yohei Yukawa
8712675cac am fb8bdc11: am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'fb8bdc1183e304e62c089353cc8765aa7783f8ab':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 19:45:32 +00: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
Yigit Boyar
2e65058de9 am e17fd940: am 0b380581: am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'e17fd9404ca07458b333ee0e827e269cbf82570d':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 19:44:59 +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
Alan Viverette
05f74b9a6b am 2c65386d: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit '2c65386d9bb3d93f39767a284eb3dcc27dd0a2f3':
  Pass explicit null theme when preloading drawables
 2014-09-22 19:37:19 +00:00
Alan Viverette
d14f290d40 am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit '0dfa4738018b93f576a3fceee2d351505983961f':
  Pass explicit null theme when preloading drawables
 2014-09-22 19:25:06 +00:00
Alan Viverette
e786895918 Merge "Pass explicit null theme when preloading drawables" into lmp-dev 2014-09-22 19:18:03 +00:00
Yohei Yukawa
a8f3d15be2 am dc5fad8e: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'dc5fad8e086a50f5e438ea8fc5bfd692e4bd76f9':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 18:23:26 +00:00
Yohei Yukawa
5c3d18d1f7 am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'b5d063dc8126d9cddf5dd5172f32213469b2c11b':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 18:12:02 +00:00
Przemyslaw Szczepaniak
4dc8d46cd0 am 19f1c973: am 299bb1fb: Fix issues with new TTS API 
* commit '19f1c97320ffe45cac6ce70bd2281f7228ca4694':
  Fix issues with new TTS API
 2014-09-22 18:05:20 +00:00