drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,542 Commits 1 Branch 0 Tags
Commit Graph

143542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prashant Malani
dd3bf97063 am 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '80c212a1c54f1fa9c6477f3c36b90e5a38a9d83d':
  Make the booting flag update unconditional
 2014-07-20 02:18:56 +00:00
Amith Yamasani
2577701434 am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 
* commit '3d1600980675bdd5ba40c9b9633e772031c70108':
  Add a hidden API to expose cross profile caller id check
 2014-07-20 02:18:46 +00:00
Prashant Malani
f47665c1be am af5f3b92: am c61f26fa: Make the booting flag update unconditional 
* commit 'af5f3b92a7acec0301067ed1cdad857056326e3b':
  Make the booting flag update unconditional
 2014-07-20 02:18:41 +00:00
Yin-Chia Yeh
bacae5e014 am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 
* commit '372461a12e3787d829ae2f300e0592ab11972c80':
  Camera2: add highSpeedVideoConfig wrapper and APIs
 2014-07-20 02:18:36 +00:00
Dake Gu
7c7ca375e7 am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement. 
* commit 'f31b6a29ce3fe6cb37668463aaf63e27fa2741de':
  ActivityTransition: fix wrong width/height applied to sharedelement.
 2014-07-20 02:18:26 +00:00
Andre Eisenbach
1a0ce0bef0 am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev 
* commit '1f961f2c95140780e8f63b081a7493508c76a240':
  Reduce GATT logging output
 2014-07-20 02:18:13 +00:00
Niels Egberts
27845a1fc7 am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev 
* commit '860e2f9f485ebc81dfad269cca183fee3d03e583':
  Add money as a new TtsSpan type.
 2014-07-20 02:17:59 +00:00
Adam Lesinski
c2332a4d00 am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API 
* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
  First iteration of a public UsageStats API
 2014-07-20 02:17:49 +00:00
John Reck
aed135f2cd am 0572b33d: am 3406fe19: Add RT-enabled reveal animator 
* commit '0572b33d35d4c6f88d6a720f9b71e0b963c95f1e':
  Add RT-enabled reveal animator
 2014-07-20 02:17:41 +00:00
Zhijun He
84e7b64844 am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed 
* commit 'b62360123f2d4dbf191319ba671bc3781c1a3bf5':
  Camera2: send the partial result with onCaptureProgressed
 2014-07-20 02:17:31 +00:00
Sailesh Nepal
65346ba580 am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev 
* commit 'd0e9c2273cdaf9919956c5b36298ab1ba62004cf':
  Add Connection.startActivityFromInCall
 2014-07-20 02:17:27 +00:00
Jean-Michel Trivi
8d873ab99f am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode() 
* commit '4298999e7500356b84bf30ef9b86a83358c2347b':
  Unhide Virtualizer.getVirtualizationMode()
 2014-07-20 02:17:22 +00:00
Sailesh Nepal
6577734bf1 am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit 'f611c799340afa4f306b9286183b0f4d3eec3ddd':
  Use main thread for RemoteConnection callbacks
 2014-07-20 02:17:18 +00:00
Jim Miller
abd5eabeca am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '656d09edfddcc748fa56acd455f579cc08057848':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-20 02:17:13 +00:00
Ye Wen
046e135bde am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '1100f339df1e089d69690aae5a39ee39f1cc694f':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-20 02:17:09 +00:00
Dan Sandler
d18a748c86 am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit 'cd307ff07f3d915f23bb8a2782bf9b08b39aafaf':
  Don't crash if user profile bitmap is null.
 2014-07-20 02:17:05 +00:00
Robert Greenwalt
3052ccee23 am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life. 
* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
  Quit NetworkMonitors at end of life.
 2014-07-20 02:17:01 +00:00
Prashant Malani
b32bc91e59 am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '269ac24ff2e4409d07a965c864ab2c4bf5636e05':
  Make the booting flag update unconditional
 2014-07-18 23:23:28 +00:00
Amith Yamasani
c89b076e9c am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 
* commit '65d3279be34b27e8a7834d3f4ee11793e7c15138':
  Add a hidden API to expose cross profile caller id check
 2014-07-18 23:19:18 +00:00
Prashant Malani
84318e52db am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '162d9433502c05c544ddb10d38f9c4b129a82352':
  Make the booting flag update unconditional
 2014-07-18 23:17:52 +00:00
Prashant Malani
10a2eb5389 am c61f26fa: Make the booting flag update unconditional 
* commit 'c61f26fae8c2c0b0c47c98204b07b2be8bd9a8ee':
  Make the booting flag update unconditional
 2014-07-18 23:15:04 +00:00
Prashant Malani
84b08adcbb Make the booting flag update unconditional 
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
 2014-07-18 23:10:08 +00:00
Yin-Chia Yeh
f59f29a5bc am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 
* commit '861dd6429d2d8fe13ec9021fc56d8d0c26440890':
  Camera2: add highSpeedVideoConfig wrapper and APIs
 2014-07-18 23:06:50 +00:00
Dake Gu
21fed59c67 am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement. 
* commit 'bd497879f75bf081bec8fa560a136c630d503317':
  ActivityTransition: fix wrong width/height applied to sharedelement.
 2014-07-18 22:54:09 +00:00
Dake Gu
7bf379c8af ActivityTransition: fix wrong width/height applied to sharedelement. 
transform screen position/size to position/size in parent of sharedelement.
fixed bug of transformMatirxToLocal() and transformMatrixToGlobal() that gets

Change-Id: I4c7b12f1ada7004ab7594961df4079be4ca4c909
 2014-07-18 22:49:57 +00:00
Andre Eisenbach
30d462daee am decb3109: Merge "Reduce GATT logging output" into lmp-dev 
* commit 'decb310973362b9849310dd0e087d256196ac62b':
  Reduce GATT logging output
 2014-07-18 22:49:52 +00:00
Niels Egberts
4daa84f255 am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev 
* commit '40268fc5bb1d56ed64ee5011371f18717eb6243a':
  Add money as a new TtsSpan type.
 2014-07-18 22:41:41 +00:00
Adam Lesinski
fe355f25d5 am e0b92a6b: First iteration of a public UsageStats API 
* commit 'e0b92a6b9017912fd6f4df96cad4b832288610a2':
  First iteration of a public UsageStats API
 2014-07-18 22:29:07 +00:00
Adam Lesinski
0debc9aff4 First iteration of a public UsageStats API 
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.

Bug: 15165667

Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
 2014-07-18 15:24:20 -07:00
John Reck
98bba797d1 am 3406fe19: Add RT-enabled reveal animator 
* commit '3406fe19f70e057b77a7f597e87b4b8511e72aa5':
  Add RT-enabled reveal animator
 2014-07-18 22:14:45 +00:00
John Reck
d3de42cae8 Add RT-enabled reveal animator 
Bug: 16161431

 Also re-writes RevealAnimator to avoid using any listeners internally,
 removing the logic around shadowing the update listeners.

Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
 2014-07-18 22:10:22 +00:00
Makoto Onuki
b472f495ac am 24cc3627: am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev 
* commit '24cc3627b4d4f62f490f56acddebe596045b3eee':
  Use "current" cp2 from telephony
 2014-07-18 22:09:19 +00:00
ztenghui
504590f0c0 am 47325dcd: am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable 
* commit '47325dcd542a676a43488648e49ed794e569c844':
  Fix FIT_XY scaleType issue on VectorDrawable
 2014-07-18 22:09:10 +00:00
ztenghui
991e5a9d6e am 736171e3: am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test 
* commit '736171e33ee60d8a047b58c3ce8dbb25fa98652f':
  Fix caching in VectorDrawable to pass the CTS test
 2014-07-18 22:08:57 +00:00
Zhijun He
015fa94da6 am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed 
* commit '3ea4b9d066bffe3e2faeb49b6e8d59068e0ccdba':
  Camera2: send the partial result with onCaptureProgressed
 2014-07-18 22:04:11 +00:00
Sailesh Nepal
775363cf31 am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev 
* commit '92119b9f8cb357223fca86407799d0d5a274b028':
  Add Connection.startActivityFromInCall
 2014-07-18 22:04:07 +00:00
Zhijun He
fac77c46fe Camera2: send the partial result with onCaptureProgressed 
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.

Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
 2014-07-18 22:01:48 +00:00
Jean-Michel Trivi
c70df24598 am 115bf42b: Unhide Virtualizer.getVirtualizationMode() 
* commit '115bf42b3321350e3869f6094c136cc545c8865f':
  Unhide Virtualizer.getVirtualizationMode()
 2014-07-18 21:42:59 +00:00
Sailesh Nepal
9fd4ad318e am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit '0587043fcc353d7a9d374c346fa1445f2e57e6da':
  Use main thread for RemoteConnection callbacks
 2014-07-18 21:38:20 +00:00
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode() 
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
 2014-07-18 21:34:39 +00:00
Jim Miller
c61c067042 am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '0f6db1e823a96d14ea831ec2bccc435dd321da28':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-18 21:34:07 +00:00
Ye Wen
892d049fa5 am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '2c960085d2780d8c2fc66d6e3b0233ef6d1fbe42':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-18 21:34:03 +00:00
Dan Sandler
65d3c1ea3b am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit '5239e4d2f5098cfb97b6f94c155e4aa4943f9d87':
  Don't crash if user profile bitmap is null.
 2014-07-18 21:24:59 +00:00
Robert Greenwalt
a58b59b08c am 721252c0: Quit NetworkMonitors at end of life. 
* commit '721252c084d74f0755b4f093fefa5ff13c6f896d':
  Quit NetworkMonitors at end of life.
 2014-07-18 21:20:34 +00:00
Dan Sandler
03dd983bad Don't crash if user profile bitmap is null. 
Bug: 16398850
Change-Id: Ie8ddb0841af255bbde098a213cb0ec1690d14c4c
 2014-07-18 21:18:52 +00:00
Robert Greenwalt
1fd9aeef08 Quit NetworkMonitors at end of life. 
We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
 2014-07-18 21:14:04 +00:00
Makoto Onuki
a3d816886f am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev 
* commit '38bfa1ba0bedde690d6e3d8c8dd5ed4b91e1e647':
  Use "current" cp2 from telephony
 2014-07-18 21:03:41 +00:00
ztenghui
4be2d3d6d5 am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable 
* commit 'f101ebb0f4c88053a8b1ca2295b7a6afe8540127':
  Fix FIT_XY scaleType issue on VectorDrawable
 2014-07-18 20:45:07 +00:00
ztenghui
9d59a76dd0 Fix FIT_XY scaleType issue on VectorDrawable 
bug:16019658

Change-Id: I8b6ac23bf14de5427d3029436acf76bd1161f0ea
 2014-07-18 20:39:35 +00:00
ztenghui
2b8b2a84c9 am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test 
* commit '22fd0f851e46cd8292553f96d93a7ebfaf537186':
  Fix caching in VectorDrawable to pass the CTS test
 2014-07-18 20:12:13 +00:00