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

144071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ihab Awad
927776c486 am 9961a6d8: am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 
* commit '9961a6d8e1a7738e68d64e77871210bfd832c780':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
 2014-07-20 02:27:21 +00:00
Ricardo Cervera
cd23a62baf am 6a4d3c94: am 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '6a4d3c944861107eca1c4ceae2bc3c3d811af21b':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-20 02:27:17 +00:00
Robert Ly
ecc9525099 am 49636d41: am c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit '49636d41e6aeef1d14d7b52c4ff7d4ef31180772':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-20 02:27:13 +00:00
Prashant Malani
10f68a5b4d am 71af3bd4: am 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '71af3bd4d756074a6ab0c08e948b9bc5ff121f83':
  Make the booting flag update unconditional
 2014-07-20 02:27:06 +00:00
Amith Yamasani
f4399a0bf5 am 63ddc256: am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 
* commit '63ddc256dd126b11f7e6bba473c44e826ac38451':
  Add a hidden API to expose cross profile caller id check
 2014-07-20 02:26:58 +00:00
Prashant Malani
cf943a23a5 am daddf687: am af5f3b92: am c61f26fa: Make the booting flag update unconditional 
* commit 'daddf687674143f4d21f2284e28ed371d85dc0bd':
  Make the booting flag update unconditional
 2014-07-20 02:26:53 +00:00
Yin-Chia Yeh
76f28e03ad am ff06075b: am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 
* commit 'ff06075b8820715e62c9edbd73d13eeb4ed1095e':
  Camera2: add highSpeedVideoConfig wrapper and APIs
 2014-07-20 02:26:49 +00:00
Dake Gu
60524f429e am b075ffe2: am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement. 
* commit 'b075ffe25fb65e037eb5c5d39298d7659e07c18d':
  ActivityTransition: fix wrong width/height applied to sharedelement.
 2014-07-20 02:26:44 +00:00
Andre Eisenbach
14bfd19867 am 59d547a8: am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev 
* commit '59d547a81c262ab8d56938b33d02ffc3442febdc':
  Reduce GATT logging output
 2014-07-20 02:26:40 +00:00
Niels Egberts
0665d26aff am 8acfe168: am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev 
* commit '8acfe168f249073a327c835eb6d42d2b8a6b0314':
  Add money as a new TtsSpan type.
 2014-07-20 02:26:35 +00:00
Adam Lesinski
78ee481583 am 30bf2ec8: am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API 
* commit '30bf2ec83da4cdcafabbdb46c89647a82aa1b857':
  First iteration of a public UsageStats API
 2014-07-20 02:26:30 +00:00
John Reck
5f772bb2de am 5bed5cc9: am 0572b33d: am 3406fe19: Add RT-enabled reveal animator 
* commit '5bed5cc982a975ba2080d719911da1758e511d2d':
  Add RT-enabled reveal animator
 2014-07-20 02:26:25 +00:00
Zhijun He
4dfc7dda58 am d6d41238: am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed 
* commit 'd6d412387d8fed4b21e177104901dd22cbd63c28':
  Camera2: send the partial result with onCaptureProgressed
 2014-07-20 02:26:21 +00:00
Sailesh Nepal
2c22f13b40 am 7841e663: am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev 
* commit '7841e663348fe6272182c10dbd6472fa25842f3b':
  Add Connection.startActivityFromInCall
 2014-07-20 02:26:16 +00:00
Jean-Michel Trivi
e27dedff59 am 8ff973b4: am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode() 
* commit '8ff973b4f5a975a50f880e1cb45f4bf564a070b1':
  Unhide Virtualizer.getVirtualizationMode()
 2014-07-20 02:26:11 +00:00
Sailesh Nepal
ef0fa969da am c072996d: am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit 'c072996dc433f0d9d16e475afe00c9a8a617d71f':
  Use main thread for RemoteConnection callbacks
 2014-07-20 02:26:06 +00:00
Jim Miller
0827369def am 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '327d056dca4cc804db27ae9591e20c7026cf1bd2':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-20 02:26:01 +00:00
Ye Wen
fd3db01621 am 8535b51d: am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '8535b51d0de6f3ac3bfa566fff2b386291f1dfc0':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-20 02:25:56 +00:00
Dan Sandler
88dd4ebdfc am 8c6b5410: am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit '8c6b54101523808256c8a110b673d7f0309efa92':
  Don't crash if user profile bitmap is null.
 2014-07-20 02:25:51 +00:00
Robert Greenwalt
ebee9202a6 am 3fbca20c: am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life. 
* commit '3fbca20ce58435d20a98391613923258524a4d38':
  Quit NetworkMonitors at end of life.
 2014-07-20 02:25:47 +00:00
Ihab Awad
8e0b4078c1 am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 
* commit 'b8c46e3a932f5666c0921b84416d8dfd7a40d727':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
 2014-07-20 02:19:15 +00:00
Ricardo Cervera
967dac596c am 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '7d808d3201675401cb42cc036792f46ccb96cd4a':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-20 02:19:04 +00:00
Robert Ly
22b94656f1 am c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'c58fee40bc72569ff36f186d8f97e708393a0c24':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-20 02:19:00 +00:00
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
Ihab Awad
bad8bb994c am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 
* commit '98abc9d111449309a718c76842e9fef05f08f4bd':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
 2014-07-18 23:38:46 +00:00
Ricardo Cervera
7c0fd4621b am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '3b74e3787a5853f6094f55d6649fadf4518c1cb5':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:23:35 +00:00
Robert Ly
2611d3a9b7 am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ec571ec09d9b745ee0400f5109ccf80d96f67fc4':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:23:32 +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
Ricardo Cervera
cbaecd0f35 am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '9c36b83519804000a3d83e141c3ce7455828b4db':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:18:09 +00:00
Robert Ly
860a6ce6d1 am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ee65b63d257f2318c10b7d5bd6797a54ca65a4cd':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:18:00 +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