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

150915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
fdda835d90 am c5d8c5e8: Merge "Fix RTL handling for Keyguard affordances" into lmp-dev 
* commit 'c5d8c5e8cf1546aa155e9e6df093a9c3bffda7f6':
  Fix RTL handling for Keyguard affordances
 2014-09-01 14:56:32 +00:00
Adrian Roos
5a0c37895b am 690611d2: Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev 
* commit '690611d2d92a800b56b0119c27b1cd661262e7b2':
  Keyguard: Register user specific broadcasts correctly
 2014-09-01 14:56:28 +00:00
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
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
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
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
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
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
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
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
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
Wonsik Kim
f271eacba7 Bind hardware TIS at startup 
Bug: 17336654
Change-Id: Ia1354305ee83c7c15afb7647f000c8b023c4648d
 2014-08-30 12:55:10 +09:00
Rachad
2875858533 am ba5fd177: Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 
* commit 'ba5fd1778b2e53461f1893d15c1a0d9233b2b4d4':
  Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID
 2014-08-30 01:49:20 +00:00
Rachad
8b63a2bf50 Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 2014-08-30 01:11:36 +00:00
Jae Seo
e008cd0d75 am 8a8afdfa: Merge "TIF: Fix comment on TvContentRating" into lmp-dev 
* commit '8a8afdfac59933437f8c36420aa9f04c13d5cf3a':
  TIF: Fix comment on TvContentRating
 2014-08-30 01:00:40 +00:00
Jeff Sharkey
6af85d7300 am 1722913f: Merge "More API lint checks." into lmp-dev 
* commit '1722913f4bdaa8949069333032594f47fb866123':
  More API lint checks.
 2014-08-30 01:00:35 +00:00
Jae Seo
f7255fcc14 Merge "TIF: Fix comment on TvContentRating" into lmp-dev 2014-08-30 00:51:19 +00:00
Jeff Sharkey
8428c5cbe2 Merge "More API lint checks." into lmp-dev 2014-08-30 00:45:28 +00:00
Jeff Sharkey
294f0de15b More API lint checks. 
When offering a helper Service, etc, all platform provided methods
should be marked final.  Otherwise, if available for developer to
override, they should follow onFoo() style naming.

Catch anyone returning concrete collections types, and look for
overlapping flags.

Change-Id: I29d95f3dff78a4da968a46f10be89eada509648c
 2014-08-29 17:41:49 -07:00
Ruben Brunk
0f946d172a am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit 'ea33afcb1fe0747b427ece6e73fe4f64e741fead':
  camera2: Add HDR vendor tag for legacy mode.
 2014-08-30 00:33:01 +00:00
Alan Viverette
b7517be3d6 am 1ebb78f5: Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev 
* commit '1ebb78f529db6f01433907f93d8bbf938af6df87':
  Fix disappearing ripple background, treat active ripple separately
 2014-08-30 00:32:56 +00:00
Ruben Brunk
6293217929 Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 2014-08-30 00:27:43 +00:00
Alan Viverette
be50bd76a9 Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev 2014-08-30 00:19:51 +00:00
Jeff Sharkey
05401fe80c am cd3fa42d: Ships passing in the night! 
* commit 'cd3fa42d2ad7df9168b3c94b93f87ed79faea9be':
  Ships passing in the night!
 2014-08-29 23:57:08 +00:00
Jeff Sharkey
af0fe973b3 Ships passing in the night! 
Fix build breakage.

Change-Id: I37e20b7e6838cb95cfd30efb52d68e81b346f8eb
 2014-08-29 16:44:09 -07:00
Alan Viverette
99758ca82e am 30da9cd4: Merge "Variety of small UI tweaks" into lmp-dev 
* commit '30da9cd4009b42cdcaff5787c7ef4f8fa6f34dee':
  Variety of small UI tweaks
 2014-08-29 23:36:01 +00:00
dcashman
ce880fc089 am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit '219d9d387b1d6133e8dd61b78f5e2556a4566a87':
  Address KeySet API Review
 2014-08-29 23:35:56 +00:00
Robin Lee
b228a5b4d4 am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev 
* commit 'cf5d78fb25a6c1d623ea8d8f5eddab8d6cd3e556':
  Keep managed profile keystores in sync with owner
 2014-08-29 23:35:49 +00:00
Jeff Sharkey
d0c87232f6 am 57d0790a: Merge "Final pass at Material DocumentsUI." into lmp-dev 
* commit '57d0790a7a593e5fe17fc3397a1f980074fa608e':
  Final pass at Material DocumentsUI.
 2014-08-29 23:35:41 +00:00
Dianne Hackborn
f434d2aa6b am 372c1ee8: Merge "More debug for issue #17310019: pause when launching settings" into lmp-dev 
* commit '372c1ee8499261fe0767fa9154077ef364c96029':
  More debug for issue #17310019: pause when launching settings
 2014-08-29 23:35:28 +00:00
Andrew Lee
dda486d3c0 am 08c79caf: Merge "Add functions for setting/getting phone accounts." into lmp-dev 
* commit '08c79caf5e8e5f7d1903f2b781918312d3288a3d':
  Add functions for setting/getting phone accounts.
 2014-08-29 23:35:23 +00:00
George Mount
39b7014384 am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 
* commit '2ad5c527c0e196ca7f62d4c04b60aad18b6a7c26':
  Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
 2014-08-29 23:35:18 +00:00
RoboErik
7c5b5ada70 am 169739a7: Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev 
* commit '169739a7feaa201268381988bbfc671dd786d5dd':
  Document MediaSession.Callback.onMediaButtonEvent and add returns
 2014-08-29 23:35:13 +00:00
Dianne Hackborn
25f9acc4f6 am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit '325662a3559d3504dbc9f6f38615eb9564185c2a':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-08-29 23:35:08 +00:00
John Spurlock
aae97ee46d am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit '84a39cb09e300386d6875c1f555c969089814fd8':
  Add a hidden system method to check call filter.
 2014-08-29 23:34:51 +00:00
Andrew Jeon
b8d5b49775 am 75d95d4c: Merge "Replace "Comment" to "Description" since description makes more sense in the context of the java doc." into lmp-dev 
* commit '75d95d4c82847e57ff817d5f11423caa83407d67':
  Replace "Comment" to "Description" since description makes more sense in the context of the java doc.
 2014-08-29 23:34:46 +00:00