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

144114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
5a9bb606a4 am 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3) 
* commit '280031995f0770e84073a894253b936e4af23566':
  Fixing ADD_CALL (1/3)
 2014-07-21 18:22:59 +00:00
Chris Craik
d5a3e217bd am 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev 
* commit '0a3bcdccb14aa7247463aa91de1cc7e3e1ea148f':
  Tweaks to outline API
 2014-07-21 18:22:53 +00:00
Adam Powell
91d67f9c7d am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 
* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
 2014-07-21 18:22:48 +00:00
Yorke Lee
c1a7bec766 am d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions 
* commit 'd4c489a867b95431fbab388bbc4cd4da57165e84':
  Rename voicemail permissions
 2014-07-21 18:22:44 +00:00
Shishir Agrawal
f05423f492 am 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 
* commit '0924a6422b3dad4bad0701c1f834cc6b5451ca44':
  Adding the ability for carrier app to override SPN and carrier name.
 2014-07-21 18:22:38 +00:00
Christopher Tate
24f448d7b3 am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where 
* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
  Fix which index goes where
 2014-07-21 18:22:33 +00:00
Sreeram Ramachandran
5854dfed88 am 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 
* commit '35de92955536b6f050e4657ece2028fab67d7f7e':
  Allow VPN interfaces to be put into blocking mode.
 2014-07-21 18:22:28 +00:00
Santos Cordon
472969a6a5 am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3) 
* commit '52cfd31ed48fdacc0ed11d1f2db7eea7f3a17fef':
  Fixing ADD_CALL (1/3)
 2014-07-20 18:00:22 +00:00
Chris Craik
4ba7901626 am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev 
* commit '7339d99353deaabfe67b421d3b1d7591c3c74d98':
  Tweaks to outline API
 2014-07-20 18:00:13 +00:00
Adam Powell
1ac577b9f9 am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 
* commit '186802acd1c36b4194804857d9e52e24b74b31cc':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
 2014-07-20 18:00:09 +00:00
Yorke Lee
c375a4aa58 am c5989521: am c5a8e2f1: Rename voicemail permissions 
* commit 'c59895217922428d3a34ae9635aba7fc4b4f7fc4':
  Rename voicemail permissions
 2014-07-20 18:00:00 +00:00
Shishir Agrawal
6256dfc9bc am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 
* commit 'b8addfa04c98c7c49862150ab6702728fb98a953':
  Adding the ability for carrier app to override SPN and carrier name.
 2014-07-20 17:59:51 +00:00
Christopher Tate
a1fd6bc661 am 32523262: am 12e9b896: Fix which index goes where 
* commit '32523262b62c4598ffd50873d290c1c601b9f842':
  Fix which index goes where
 2014-07-20 17:59:46 +00:00
Sreeram Ramachandran
d9c973c8c1 am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 
* commit '5e23de196c3ac98e5a0da88515bad5d985d348d9':
  Allow VPN interfaces to be put into blocking mode.
 2014-07-20 17:59:41 +00:00
Winson Chung
d9e90a624b am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 
* commit 'c655f3a4487d5f810b392460227f0bad91c2768c':
  Add setting to guard the lock-to-app recents icon
 2014-07-20 02:19:27 +00:00
Winson Chung
5f57e95926 am 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '10b49835cf7496f76e521b14b837326e80ac93e1':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-20 02:19:22 +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
Jay Civelli
e15ecb21f4 Merge "Fix removeListener in TrustManagerService." 2014-07-19 22:40:06 +00:00
Winson Chung
7bb0933698 am 01eca811: am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 
* commit '01eca811404a02bcbfe01231d88fe8fa9ac57df3':
  Add setting to guard the lock-to-app recents icon
 2014-07-20 02:27:30 +00:00
Winson Chung
36ca645ca7 am 1820307c: am 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '1820307c5bddbf2a680157372aab4213b3fcba75':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-20 02:27:26 +00:00
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