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

152975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
ef56dad5b8 Merge "Fix RTL handling for Keyguard affordances" into lmp-dev 2014-09-01 14:54:21 +00:00
Adrian Roos
5dc864ce0e Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev 2014-09-01 14:46:25 +00:00
Jorim Jaggi
ef067fb879 Fix RTL handling for Keyguard affordances 
Bug: 17328362
Change-Id: Ieb076c46379085e043b0c16755355d4c3018bd7d
 2014-09-01 16:44:48 +02:00
Yohei Yukawa
d80d8645d7 am 08e56027: Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev 
* commit '08e560277327ee4fea86d642948e2195a874344a':
  Get rid of one redundant comparison of #mComposingTextStart
 2014-09-01 14:43:26 +00:00
Yohei Yukawa
9477891f23 Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev 2014-09-01 14:31:56 +00:00
Adrian Roos
48c796cad6 Keyguard: Register user specific broadcasts correctly 
Fixes the face unlock indicator only working for the
owner user. While we're at it, also fix other broadcasts
that should have been registered for all users and not just
the owner.

Bug: 17251445
Change-Id: I53cad656d7d1e1d312bff2eebfc0c23ea467e0b7
 2014-09-01 16:03:38 +02:00
Selim Cinek
1a2753876e am fb1e2378: am d59b0aaf: Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev 
* commit 'fb1e2378bc112227a91bfe7dc66ad76a97731c2e':
  Not enforcing a timeout anymore for talkback users
 2014-09-01 11:29:46 +00:00
Selim Cinek
9132ced866 am d59b0aaf: Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev 
* commit 'd59b0aafe0200b4a7b685534ed3e049ec9b7f0fc':
  Not enforcing a timeout anymore for talkback users
 2014-09-01 11:17:21 +00:00
Selim Cinek
6531ae2fcd Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev 2014-09-01 11:08:09 +00:00
Marcin Kosiba
cf5f1c3a5e am b1ad72c4: (-s ours) am 25d928f6: Merge "Update WebViewFactory.java to compile in AOSP." 
* commit 'b1ad72c4844c4664f8af848a69db1da9bbf54a20':
  Update WebViewFactory.java to compile in AOSP.
 2014-09-01 10:30:04 +00:00
Marcin Kosiba
56c26d2e9c am 0b0c8c0a: (-s ours) am 5ddbe722: Merge "Load the WebView Java code via createPackageContext." 
* commit '0b0c8c0a2608cf3f87c3854cf3cc44ce320b3f01':
  Load the WebView Java code via createPackageContext.
 2014-09-01 10:23:40 +00:00
Marcin Kosiba
c5bddec1c6 am f5249619: (-s ours) am 2453f611: Merge "Remove WebView library preloading mechanism." 
* commit 'f524961949eaa7239dee31491c529b470ac9d6de':
  Remove WebView library preloading mechanism.
 2014-09-01 09:38:04 +00:00
Christoph Studer
03084aba24 NoMan: Disable SQLite stats DO NOT MERGE 
Bug: 16777910
Change-Id: I3df8a147e07bf088420769d86bfb766885488506
 2014-09-01 11:27:46 +02:00
Marcin Kosiba
b1ad72c484 am 25d928f6: Merge "Update WebViewFactory.java to compile in AOSP." 
* commit '25d928f687408058f007051878574ea66691d9dc':
  Update WebViewFactory.java to compile in AOSP.
 2014-09-01 09:13:45 +00:00
Marcin Kosiba
0b0c8c0a26 am 5ddbe722: Merge "Load the WebView Java code via createPackageContext." 
* commit '5ddbe722befa58db3b14bcbec55bf5313cd80962':
  Load the WebView Java code via createPackageContext.
 2014-09-01 09:13:40 +00:00
Marcin Kosiba
f524961949 am 2453f611: Merge "Remove WebView library preloading mechanism." 
* commit '2453f611d9b7c60c4ae9766b4bad42b9e1d13777':
  Remove WebView library preloading mechanism.
 2014-09-01 09:13:35 +00:00
Marcin Kosiba
25d928f687 Merge "Update WebViewFactory.java to compile in AOSP." 2014-09-01 08:50:25 +00:00
Marcin Kosiba
5ddbe722be Merge "Load the WebView Java code via createPackageContext." 2014-09-01 08:50:10 +00:00
Marcin Kosiba
2453f611d9 Merge "Remove WebView library preloading mechanism." 2014-09-01 08:48:50 +00:00
Wonsik Kim
1ffa2b5bbd am 64351f10: am 6f0f566d: Merge "Bind hardware TIS at startup" into lmp-dev 
* commit '64351f106821e591644d3b2f446601999311a2d3':
  Bind hardware TIS at startup
 2014-09-01 04:53:40 +00:00
Wonsik Kim
77bc49306c am 6f0f566d: Merge "Bind hardware TIS at startup" into lmp-dev 
* commit '6f0f566d53175e818b80b0639397a70264ee37de':
  Bind hardware TIS at startup
 2014-09-01 04:41:49 +00:00
Wonsik Kim
8591fb27c0 Merge "Bind hardware TIS at startup" into lmp-dev 2014-09-01 04:32:56 +00:00
Ji-Hwan Lee
283e82b007 am 669ad493: am 3b5096be: Merge "Add missing checks for the current session callback" into lmp-dev 
* commit '669ad493fdf1b8c7422e0ce3d2d4e37b930f8db4':
  Add missing checks for the current session callback
 2014-09-01 04:23:32 +00:00
Ji-Hwan Lee
8e9d93c421 am 3b5096be: Merge "Add missing checks for the current session callback" into lmp-dev 
* commit '3b5096be57ed382d6963da85e5c66bd74bcb8755':
  Add missing checks for the current session callback
 2014-09-01 04:11:33 +00:00
Ji-Hwan Lee
9033bca6b0 Merge "Add missing checks for the current session callback" into lmp-dev 2014-09-01 04:03:44 +00:00
Yohei Yukawa
e05d4ca4dc Get rid of one redundant comparison of #mComposingTextStart 
The code in question is not only redundant but also
harmful because it causes unnecessary integer boxing.

BUG: 17340578
Change-Id: Ife6e48889db80394d224297c53806105dc41d56e
 2014-08-31 18:29:37 -07:00
Yohei Yukawa
12f6b942c0 am 69e65540: am 5a46d984: Merge "Fix illegal cast in a logging code" into lmp-dev 
* commit '69e65540b3a8ef56fc4d1061714c9e4ec98104cb':
  Fix illegal cast in a logging code
 2014-09-01 00:53:00 +00:00
Yohei Yukawa
e82b7ead05 am 5a46d984: Merge "Fix illegal cast in a logging code" into lmp-dev 
* commit '5a46d984ed29d92240e629527b844c3d42e0480b':
  Fix illegal cast in a logging code
 2014-09-01 00:41:56 +00:00
Yohei Yukawa
eec5634f3e Merge "Fix illegal cast in a logging code" into lmp-dev 2014-09-01 00:32:57 +00:00
Baligh Uddin
d2b4b70bfe Import translations. DO NOT MERGE 
Change-Id: I8d7de91479115c83cfca807b873e091985ad2ede
Auto-generated-cl: translation import
 2014-08-31 16:22:33 -07:00
George Mount
4b310aa515 am ae570491: am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 
* commit 'ae5704917b9c7031d78c39c54bce962dbc5dad10':
  Fix NPE in EnterTransitionCoordinator.
 2014-08-31 23:14:32 +00:00
Baligh Uddin
d7c8de657d Import translations. DO NOT MERGE 
Change-Id: I4ecd4e329e123af0ddd9c9eb9a2179adcdd86f96
Auto-generated-cl: translation import
 2014-08-31 16:14:23 -07:00
Yohei Yukawa
080fa34577 Fix illegal cast in a logging code 
This is a follow up CL for I19ad8542659bc092b92ee13eb9,
which introduced a ClassCastException error in the logging code
of MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER handler.

With this CL, the protocol in question looks like:
- what: MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER
- arg1: sequence number to be passed to
    #setUserActionNotificationSequenceNumber(int)
- arg2: not used
- obj:  ClientState

BUG: 16238154
BUG: 7043015
Change-Id: I08d52d4564bae9e042a2eff359e92549a66e837b
 2014-08-31 16:10:05 -07:00
Baligh Uddin
142dbe71ab Import translations. DO NOT MERGE 
Change-Id: Ib3a6af2658ae965d3890b3750a44f3a3ea505742
Auto-generated-cl: translation import
 2014-08-31 16:08:05 -07:00
George Mount
b180f1a7bb am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 
* commit '4e51bc36f0d03deb85451a10e83b1e92740be457':
  Fix NPE in EnterTransitionCoordinator.
 2014-08-31 23:03:00 +00:00
George Mount
3acc8f14cd Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 2014-08-31 22:52:43 +00:00
George Mount
0813a94c7b am f055be2d: am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev 
* commit 'f055be2d46e2a42920b3cffe9af2a645560e926d':
  Use optimized Keyframes for Path animations.
 2014-08-31 22:40:19 +00:00
George Mount
7e5df46a2a am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev 
* commit '8ee63e6ce6e9d6e873eee6d331449b93fb44852c':
  Use optimized Keyframes for Path animations.
 2014-08-31 22:27:37 +00:00
George Mount
6690e3a167 Merge "Use optimized Keyframes for Path animations." into lmp-dev 2014-08-31 22:17:46 +00:00
Baligh Uddin
de4e396b4b Import translations. DO NOT MERGE 
Change-Id: I2e8d61b219485d45e8446750dc0b416a6e58a453
Auto-generated-cl: translation import
 2014-08-31 13:39:48 -07:00
Baligh Uddin
0a14d1e569 Import translations. DO NOT MERGE 
Change-Id: I727035c5d02efd35eef5ed40f46daa167fe805f1
Auto-generated-cl: translation import
 2014-08-31 12:38:19 -07:00
Tyler Gunn
1e9b642bfe am 1cfc6db2: am 1207f7a7: Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev 
* commit '1cfc6db24fc4a820bcb7a6b1c3653e3e80e88a9a':
  Hiding videoState values in telecomm APIs. (1/3)
 2014-08-31 09:36:07 +00:00
Rachad
350fe32550 am ff09c60d: am ba5fd177: Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 
* commit 'ff09c60d4da75eb12c6b01968ee661bc5e16a75c':
  Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID
 2014-08-30 18:42:16 +00:00
Ji-Hwan Lee
774f6c3657 Add missing checks for the current session callback 
Bug: 17336320
Change-Id: I4676c4d76d1ed9d22bd476319098cbfcce52cd6d
 2014-08-30 16:11:50 +09:00
Tyler Gunn
bdc1c3c356 am 1207f7a7: Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev 
* commit '1207f7a7fc6fe13ee9069bb5a403f0aa623260bd':
  Hiding videoState values in telecomm APIs. (1/3)
 2014-08-30 06:34:29 +00:00
Tyler Gunn
b730542b75 Merge "Hiding videoState values in telecomm APIs. (1/3)" into lmp-dev 2014-08-30 06:26:04 +00:00
Amith Yamasani
1df1473008 Make it possible to remove current user 
Due to the async nature of switching users, it's not possible to
switch and remove immediately. So mark the switch target user as
soon as the user switch is requested, so that a remove will proceed
without failing at stopUserLocked().

Also, fix a similar problem with deleting the current guest and
switching to a new guest. It was attempting to remove the current
user which will result in a failed stopping of the user.
Added a way to mark the current guest
for deletion so that a new one can be created, switched to and the
old one deleted. If runtime fails, old guest is already marked for
deletion and will be cleaned up on restart.

Bug: 17321533
Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
 2014-08-29 22:06:16 -07:00
Wonsik Kim
f271eacba7 Bind hardware TIS at startup 
Bug: 17336654
Change-Id: Ia1354305ee83c7c15afb7647f000c8b023c4648d
 2014-08-30 12:55:10 +09:00
Jae Seo
56ec676209 am 4525b6f7: am 8a8afdfa: Merge "TIF: Fix comment on TvContentRating" into lmp-dev 
* commit '4525b6f7fab6c14a206ff9fdee85746285898ab0':
  TIF: Fix comment on TvContentRating
 2014-08-30 03:00:02 +00:00
Jeff Sharkey
4821cc7449 am c232d730: am 1722913f: Merge "More API lint checks." into lmp-dev 
* commit 'c232d730ca1a6d1ede9cc79c8f81c77dae999a3c':
  More API lint checks.
 2014-08-30 02:59:55 +00:00