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

150379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
93697c5f8e am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and multi-input kernels." 
* commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23':
  Collapse code paths for single- and multi-input kernels.
 2014-08-18 20:00:34 +00:00
Stephen Hines
4ae9a6d5c5 am 42895561: Merge "Collapse code paths for single- and multi-input kernels." 
* commit '428955614836c4a51737e8ff9d4b653c5a80eecd':
  Collapse code paths for single- and multi-input kernels.
 2014-08-18 19:50:55 +00:00
Ricardo Cervera
20ae7b7cb6 am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit 'cce5036cb00c7e25f1d226c6405e6231f5913444':
  docs: Removing radio from music intents
 2014-08-18 19:49:12 +00:00
Elliott Hughes
c97de79ad2 am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:48:26 +00:00
John Spurlock
162b40e4f9 am e4cbd7b3: am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev 
* commit 'e4cbd7b3e096d2aa03a01d38e92090999489ae1f':
  Temporary workaround for NetworkOverLimitActivity dialog.
 2014-08-18 19:39:48 +00:00
Elliott Hughes
400ec1b938 am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:38:36 +00:00
Ricardo Cervera
cce5036cb0 am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4':
  docs: Removing radio from music intents
 2014-08-18 19:38:16 +00:00
Elliott Hughes
7380d866e5 am 72d3cef8: am 708da446: Merge "Use gettid directly in frameworks JNI." 
* commit '72d3cef8675b4a8eced300adeb148a835b7fdd57':
  Use gettid directly in frameworks JNI.
 2014-08-18 19:34:27 +00:00
John Spurlock
2cda14b909 am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev 
* commit '7ef696b6ed662abf1066f33d293ccad6f0808126':
  Temporary workaround for NetworkOverLimitActivity dialog.
 2014-08-18 19:30:17 +00:00
Nicolas Prevot
95f9f8535d am 3eb16dc4: am cdc4b08c: Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 
* commit '3eb16dc478c0cacbf770d35b41d96448a0e96654':
  When forwarding intents, ignoring the package set in the intent.
 2014-08-18 19:29:14 +00:00
Dianne Hackborn
00eea5072b am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '4a0bc3cc94f034f0a83f1e68edf7d440181777ba':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:29:08 +00:00
Nicolas Prévot
cf4d240140 am 9ecc411b: am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 
* commit '9ecc411b74923957691a9150acb9c3b38d27cd41':
  Revert "Adding the requiredForProfile flag."
 2014-08-18 19:29:03 +00:00
Svetoslav
7a3867f3e5 am f0307cc9: am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev 
* commit 'f0307cc91363b8e2b37372b72a5a44c3ce9aa9ab':
  Fix a crash in RemoteViews.
 2014-08-18 19:28:58 +00:00
Sunny Goyal
7bf7a25618 am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev 
* commit '868b656d19dc6920fbcabe61e4913f95c4b68de0':
  Fixing bounds check.
 2014-08-18 19:28:53 +00:00
Craig Stout
c27e79d3e1 am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit 'b23f941f0f0b2ad267b8617aefd41bdc132fd21a':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:28:48 +00:00
Ricardo Cervera
86b9efee71 am 34300eb9: am b3615747: am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit '34300eb9a49161fa0d573b1562e38d1e85b53c33':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 19:28:43 +00:00
Lenka Trochtova
3b60140f45 am b32505ed: am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'b32505ed5945fde278924c374ff90f8b8e5b67bb':
  Make AudioState constructors public
 2014-08-18 19:28:38 +00:00
Deepanshu Gupta
d9f0102f0d am 23748f1a: am eab5df3a: am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit '23748f1a190c3f9d5c3f71e41f7138f1eafed897':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:28:33 +00:00
Deepanshu Gupta
8d030f7094 am 2d1aa0f6: am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '2d1aa0f63f133e0db3c621cdff5e48ce513f8fdc':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:28:28 +00:00
Santos Cordon
7fe51ee4ee am d2b3eeff: am ac0a6e48: Update conference call APIs. 
* commit 'd2b3eefff963e410cc38ef3580615c6c4ba7df27':
  Update conference call APIs.
 2014-08-18 19:28:23 +00:00
Guang Zhu
ec78642ff2 am c1b9d693: am 9afdb3f7: Merge "Disable immersive mode confirmation for test automation" into lmp-dev 
* commit 'c1b9d69351b7d75c7dbe7ed28fbdb158eb3ad899':
  Disable immersive mode confirmation for test automation
 2014-08-18 19:28:18 +00:00
Kenny Root
74a74b637e am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit 'b4b398b7cae59c581930acc58d9b9f09262c0695':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:28:14 +00:00
Ricardo Cervera
88a1f40c5d am fb1f5bde: docs: Removing radio from music intents 
* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
  docs: Removing radio from music intents
 2014-08-18 19:28:02 +00:00
Elliott Hughes
72d3cef867 am 708da446: Merge "Use gettid directly in frameworks JNI." 
* commit '708da44695216b57a9389a74b95b4ef6f530120a':
  Use gettid directly in frameworks JNI.
 2014-08-18 19:24:37 +00:00
Nicolas Prevot
b883a449d3 am cdc4b08c: Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 
* commit 'cdc4b08c5689737d59e9390e61673cca042c6058':
  When forwarding intents, ignoring the package set in the intent.
 2014-08-18 19:19:33 +00:00
Dianne Hackborn
e302815eae am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 
* commit '2dff9254409ed91141ce72e9b998557a9f9e77f0':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
 2014-08-18 19:19:28 +00:00
Nicolas Prévot
ad1e09fa64 am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 
* commit '1e8e553b59f409b5695971c6999907eafffdab3c':
  Revert "Adding the requiredForProfile flag."
 2014-08-18 19:19:23 +00:00
Svetoslav
7fb8214ecf am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev 
* commit '1b3e768a1c1a2a66e8a53a9e31acdddceb02e4f7':
  Fix a crash in RemoteViews.
 2014-08-18 19:19:19 +00:00
Sunny Goyal
e74d28705b am 860af1e5: Merge "Fixing bounds check." into lmp-dev 
* commit '860af1e50b9042fa4f6ada2349602b7a6fa2cc53':
  Fixing bounds check.
 2014-08-18 19:19:14 +00:00
Craig Stout
4888a76b2c am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 
* commit 'a245102a05cf9435c90adc1fafd071d583a5fdc3':
  Fix alert, date picker, time picker dialogs for TV.
 2014-08-18 19:19:10 +00:00
Ricardo Cervera
78b4edd9c9 am b3615747: am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'b361574793f70c8eb0d6f84a3898251c513a827b':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 19:19:04 +00:00
Lenka Trochtova
0fb23ebe75 am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit '15a4b30652b797bf8e1997d85627b345de198813':
  Make AudioState constructors public
 2014-08-18 19:18:59 +00:00
Deepanshu Gupta
4acd03f7ca am eab5df3a: am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'eab5df3ab95d47e7c856648b11878163589c7b35':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:18:55 +00:00
Deepanshu Gupta
1d0931a681 am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '8f7cc496d2736eaccdbe1409d464e737c9909e3d':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:18:50 +00:00
Santos Cordon
6989f648e9 am ac0a6e48: Update conference call APIs. 
* commit 'ac0a6e48dd2498a17d2e9d1617d76045bd9ae01a':
  Update conference call APIs.
 2014-08-18 19:18:45 +00:00
Guang Zhu
2e714195a7 am 9afdb3f7: Merge "Disable immersive mode confirmation for test automation" into lmp-dev 
* commit '9afdb3f726b6c484973a6916942c2c9da90099c8':
  Disable immersive mode confirmation for test automation
 2014-08-18 19:18:41 +00:00
Kenny Root
9e22a99e32 am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit '286a143456d15dad41f3dad1e34359144b2db489':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:18:36 +00:00
Dianne Hackborn
80086cd4b4 am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit 'a0a646245c6aefa9d8303b641256381e639f0d47':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 19:17:51 +00:00
Dianne Hackborn
84ba83bb3d am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 19:17:47 +00:00
Ricardo Cervera
fb1f5bdef0 docs: Removing radio from music intents 
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
 2014-08-18 12:13:04 -07:00
Ricardo Cervera
bb8f4a6113 am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'f960409f3b361df492ea7a9a48aefe89d5992572':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 18:06:43 +00:00
Lenka Trochtova
8450fd17b1 Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 2014-08-18 18:06:41 +00:00
Deepanshu Gupta
5cb5059b6c am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'da9baa15bf780d4e8924adbed3d8863c75da5e6c':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:26 +00:00
Deepanshu Gupta
6e8a98c8b7 am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit 'a4ceb9e64cd1ee6302e41c7799ebb6610af96d0e':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:07 +00:00
Chet Haase
030435773d Fix crash in AnimationDrawable 
When a drawable becomes invisible, it unschedule itself, which
sets mCurrentFrame to -1. Later, when it becomes visible, it
calls setFrame() with either 0 (if 'restart' is true) or
mCurrentFrame. Calling setFrame() with a value of -1 causes a crash
later as we dereference an invalid location in the state durations
array.

This fix also checks mCurrentFrame and calls setFrame with 0 when the
current frame is invalid. This takes the code back closer to what it
used to be when setFrame was always called with 0, although now it will
use a valid frame when it is set.

Issue #16489419 Google Translate crashes whenever hitting done button on keyboard to get translation result.

Change-Id: I1f5b8672d209017aa8a4eaa15bd7ddd2f3ae38d1
 2014-08-18 10:33:58 -07:00
Santos Cordon
823fd3c79d Update conference call APIs. 
Clean up conference call APIs to use a distinct type separate from
Connection.  Also allow the addition of Conference calls at any point
using addConference() API method.

Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
 2014-08-18 17:30:58 +00:00
Dianne Hackborn
b8284a8bb8 am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit '728f5d08c891a4e6f9e437bd2398ce9ea36db8b6':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 17:21:02 +00:00
Dianne Hackborn
c14776cb3c am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit 'e882cea6d6f92efd68191f1f74fd27fb9e1d9016':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 17:20:57 +00:00
Adrian Roos
48986869c3 am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:14:52 +00:00
Adrian Roos
38f88e756d am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit 'a31e2348e929c76572e634bc67df10581e6684fa':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:07:43 +00:00