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

152671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Ruben Brunk
af496e7ba0 am 25e44765: am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit '25e4476596079bc603b0822d6255d31119380a3f':
  camera2: Add HDR vendor tag for legacy mode.
 2014-08-30 00:44:48 +00:00
Alan Viverette
0a5625fdb2 am 14fa6b6d: am 1ebb78f5: Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev 
* commit '14fa6b6d164fbd8ea84e4ad93454669ad9c30d97':
  Fix disappearing ripple background, treat active ripple separately
 2014-08-30 00:44:41 +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
a658a3185d am fdc139eb: am cd3fa42d: Ships passing in the night! 
* commit 'fdc139eb969a341971bf58349860668c3b224afc':
  Ships passing in the night!
 2014-08-30 00:05:23 +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
Alan Viverette
9094d5671a am ecba5c53: am 30da9cd4: Merge "Variety of small UI tweaks" into lmp-dev 
* commit 'ecba5c53317409aab4b78ce12d78cf32114c7a5f':
  Variety of small UI tweaks
 2014-08-29 23:54:54 +00:00
dcashman
a289ea1f1b am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit 'e71234b3410519d2d0ab91775378e594f74a73bb':
  Address KeySet API Review
 2014-08-29 23:54:49 +00:00
Robin Lee
aacc124d6e am 066b8593: am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev 
* commit '066b85934baad993d4040723192ed07846d3af71':
  Keep managed profile keystores in sync with owner
 2014-08-29 23:54:44 +00:00
Jeff Sharkey
3989b187d7 am 1af8d591: am 57d0790a: Merge "Final pass at Material DocumentsUI." into lmp-dev 
* commit '1af8d591a20d2c68e218fc6c878e9e312cb9da19':
  Final pass at Material DocumentsUI.
 2014-08-29 23:54:38 +00:00
Dianne Hackborn
8242d1fcd9 am dfd93f1f: am 372c1ee8: Merge "More debug for issue #17310019: pause when launching settings" into lmp-dev 
* commit 'dfd93f1faf4d10c8923bf13f9fcef7820739f31a':
  More debug for issue #17310019: pause when launching settings
 2014-08-29 23:54:33 +00:00
Andrew Lee
6caf3a767e am 5cfc3188: am 08c79caf: Merge "Add functions for setting/getting phone accounts." into lmp-dev 
* commit '5cfc3188f93c88e291c81ef8b41061b2faa7503d':
  Add functions for setting/getting phone accounts.
 2014-08-29 23:54:27 +00:00
George Mount
ea4da9e19f am 8383fba1: am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 
* commit '8383fba1c61d3b7d2f7cafb85a3c186d4b7eaf27':
  Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
 2014-08-29 23:54:22 +00:00
RoboErik
3bf1f1d042 am e9fbaa4e: am 169739a7: Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev 
* commit 'e9fbaa4e76816644330629958f2a822991fb66cf':
  Document MediaSession.Callback.onMediaButtonEvent and add returns
 2014-08-29 23:54:17 +00:00
Dianne Hackborn
b74989b40c am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit 'd0780328259c9522e150e790e24226325c2288f7':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-08-29 23:54:12 +00:00
John Spurlock
c9093b30f0 am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit 'ec6c1a68a5a48cb20f7290342f17de85778741db':
  Add a hidden system method to check call filter.
 2014-08-29 23:54:07 +00:00
Andrew Jeon
617cfa8e3c am d06311db: am 75d95d4c: Merge "Replace "Comment" to "Description" since description makes more sense in the context of the java doc." into lmp-dev 
* commit 'd06311db001f3a813c11661ecda89cfd8536c523':
  Replace "Comment" to "Description" since description makes more sense in the context of the java doc.
 2014-08-29 23:54:03 +00:00
Amith Yamasani
5c5d8f8e5a am b9970b0f: am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev 
* commit 'b9970b0fbe5f4436490552f52c64331cbec78d3e':
  Clean up apks installed for a removed user
 2014-08-29 23:53:58 +00:00
Christopher Tate
d8b65c6883 am 6fc30ac1: am fc6eda1b: Merge "Expand job scheduler dumpsys a bit" into lmp-dev 
* commit '6fc30ac187f83bdcbea5888d97741408cbcc42bf':
  Expand job scheduler dumpsys a bit
 2014-08-29 23:53:53 +00:00
Michael Wright
6eb8b59159 am a4e2b977: am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev 
* commit 'a4e2b9771dc8903a27ea2a73e1b208c87a38c097':
  Use a linear spline if there's a non-monotonic brightness curve
 2014-08-29 23:53:48 +00:00
Dianne Hackborn
5c69d9403f am 59a6a8a5: am aa631d9a: Merge "Fix issue #17329066: Crash in ActivityManager" into lmp-dev 
* commit '59a6a8a5081ca7670ae120ee9a4a66004f6bf0f5':
  Fix issue #17329066: Crash in ActivityManager
 2014-08-29 23:53:42 +00:00
Adam Lesinski
d299fef90c am a7e85db1: am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 
* commit 'a7e85db12557c0480e3836c414519b28331d502c':
  Add test to ensure themes get copied from separate resource tables
 2014-08-29 23:53:37 +00:00
ztenghui
28b4a5d058 am 04834f4d: am b379a6e9: Merge "Ambient shadow tessellation improvement." into lmp-dev 
* commit '04834f4d8f6d2a4d803b59a22f5b6d3b8dd97369':
  Ambient shadow tessellation improvement.
 2014-08-29 23:53:32 +00:00
Dianne Hackborn
b434b330ce am 2cbafc27: am 8eec555a: Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev 
* commit '2cbafc271eef3a8568a37a5591b6b2a0ccc96d87':
  Fix issue #17329290: NPE during ContentProviderRecord.dump()
 2014-08-29 23:53:27 +00:00
Scott Rowe
c7b5f92996 am eac8cbbb: am 526b7932: am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit 'eac8cbbb4786dbe6aa064dd0ef21d6900a77e1f1':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 23:53:09 +00:00
Chris Wren
3f420855ae am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit 'a69ad7a380c246f3665984aad4ce53cf9e025e8c':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:53:05 +00:00
Winson Chung
9cd74d9835 am 73a6148e: am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '73a6148e4be868e8eb4ffef9b5fbc8afd502ebff':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:53:00 +00:00
Craig Mautner
b7389933e3 am bf22a48e: am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev 
* commit 'bf22a48eba2bc567ccfb8c8a4c364c27151135ca':
  Don't use anim background for translucent windows
 2014-08-29 23:52:55 +00:00
Jeff Sharkey
af0fe973b3 Ships passing in the night! 
Fix build breakage.

Change-Id: I37e20b7e6838cb95cfd30efb52d68e81b346f8eb
 2014-08-29 16:44:09 -07:00