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

3624 Commits

Author SHA1 Message Date
Terry Heo
e5e1d6da5f am 1f0736a0: am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 
* commit '1f0736a064e2911a5ad76f49d32cda88fb4f53f4':
  CEC: Implement dump() of HdmiControlService
 2014-08-29 19:14:23 +00:00
Terry Heo
2966c8689d am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 
* commit 'b2357d5aabf85fa1b36036024e53da7dab416815':
  CEC: Implement dump() of HdmiControlService
 2014-08-29 18:49:09 +00:00
Terry Heo
97bf45464c Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 2014-08-29 05:12:57 +00:00
Dianne Hackborn
a552f23f44 am c19eea49: am 3452f1cf: am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit 'c19eea492289cbd9ec0ffecfb5837e44cd14cf14':
  Debug issue #17310019: pause when launching settings
 2014-08-29 04:20:28 +00:00
Alex Light
06e8595952 am fbe7c94f: am edcab233: am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'fbe7c94f4162034e857556284858bb33c5ceb5fe':
  Remove obsolete pruneDexCache
 2014-08-29 04:20:16 +00:00
Dongwon Kang
a859169324 am 444da437: am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '444da43744719467c6deb385ba13fbff5fa606d0':
  TIF: cosmetic changes for consistency.
 2014-08-29 04:20:05 +00:00
Dianne Hackborn
84c043dace am 3452f1cf: am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit '3452f1cf2d3451fbb5f69c0e0102f808354852b2':
  Debug issue #17310019: pause when launching settings
 2014-08-29 03:58:52 +00:00
Alex Light
cd91f11be5 am edcab233: am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'edcab2336315f90b225c85d2d6d725ec79679b26':
  Remove obsolete pruneDexCache
 2014-08-29 03:58:41 +00:00
Dongwon Kang
ada47f476f am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '8f50a3888a62303cbdc683654c686223b8266bf4':
  TIF: cosmetic changes for consistency.
 2014-08-29 03:58:29 +00:00
Dianne Hackborn
3d07395206 Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 2014-08-29 00:56:49 +00:00
Dianne Hackborn
ecf1cda068 Debug issue #17310019: pause when launching settings 
Let's log!

Change-Id: Icaf42d46aff6e74ee5fc98611dd77083a5d5052e
 2014-08-28 17:52:33 -07:00
Alex Light
e545035e0e Remove obsolete pruneDexCache 
Bug: 16875245

(cherry picked from commit 09107db4916913912e61bfe592643b9c4c50b500)

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
 2014-08-28 17:02:37 -07:00
Dongwon Kang
371bee50f9 Merge "TIF: cosmetic changes for consistency." into lmp-dev 2014-08-28 23:49:33 +00:00
Dongwon Kang
fd8aa02d73 TIF: cosmetic changes for consistency. 
- Remove uncessarry logic in buildTvInputListLocked().
  (No longer needed because we removed availability.
   Verified the bug case, b/15738607, does not happen without this logic.)
- Rename member variables in XXXState classes.
- Define SessionCallback for consistency.

Change-Id: I49642c909ad7f77d97d1d90670c7bb7c2b12cda8
 2014-08-29 08:48:02 +09:00
Diego Pontoriero
86b48ac335 am ca03ee0e: am 0c39756f: am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit 'ca03ee0ec5dcb451739ff6a0399a9e0caf9ecae3':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:23:58 +00:00
Diego Pontoriero
350052ec9c am 0c39756f: am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit '0c39756f39b4098bdf8b3f391652046cc565018c':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:11:29 +00:00
RoboErik
d133303a5c am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 23:08:20 +00:00
Chris Craik
626877a9ea am 75a65625: am a1590b87: am 7732c066: Merge "Force translucency for inset windows" into lmp-dev 
* commit '75a656254b2fa5818c20c67dfe1cd796de197500':
  Force translucency for inset windows
 2014-08-28 22:58:25 +00:00
RoboErik
97a3377dfe am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit '86e941e6b80481dba07731def3968f29c760c982':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 22:57:25 +00:00
Diego Pontoriero
921db7e1de Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 2014-08-28 22:38:50 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
Chris Craik
d05b3f8de7 am a1590b87: am 7732c066: Merge "Force translucency for inset windows" into lmp-dev 
* commit 'a1590b8765d1d2f3086dd807cce17955d670bc17':
  Force translucency for inset windows
 2014-08-28 21:13:53 +00:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback 
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
 2014-08-28 21:11:22 +00:00
Diego Pontoriero
3892fc0349 Change TelephonyManager method name to accurately reflect functionality. 
Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
 2014-08-28 13:50:36 -07:00
Chris Craik
12b500959d Merge "Force translucency for inset windows" into lmp-dev 2014-08-28 20:49:06 +00:00
Dianne Hackborn
d5b4d7a40a am 2575d022: am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit '2575d022baf42e0945750703ccc7e5adb65e2009':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 20:10:33 +00:00
Dianne Hackborn
85facfc1b7 am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit 'c297cc71d1382b3a492087d64205ebe6f13b164a':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 20:01:12 +00:00
Winson Chung
dd014e73bf am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:51:08 +00:00
Winson Chung
19042f10fa am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit 'ef390cca57352e4284827981d39d6cb600b2811d':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:38:45 +00:00
Dianne Hackborn
2db754ac6e Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 2014-08-28 19:33:08 +00:00
Christoph Studer
23867c4303 am df5eb412: am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'df5eb41241872e641a199b7089894dac5c9c358c':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:32:39 +00:00
Dianne Hackborn
102ecc0e11 am 73c10aa4: am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '73c10aa477896d0b46b223613e34781bb98589ff':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:32:33 +00:00
Christoph Studer
2a7058d18d am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev 
* commit 'a03d8335fea5e19e56e901e15213f0db16d570b6':
  NoListener: Factor out ZEN mode API
 2014-08-28 19:23:19 +00:00
Dianne Hackborn
93d0678e80 am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '82f7dc780dc2fb1c877fce19bea9a9e92b0a0bac':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:23:14 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
Dianne Hackborn
7e7f9a3f7c Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 2014-08-28 18:58:16 +00:00
Dianne Hackborn
d7c9289f93 Fix issue #17289876: startActivityFromRecents appears to launch the wrong task 
It would be good to actually bring the task to the front.

Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.

And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.

Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
 2014-08-28 11:38:13 -07:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API 
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
 2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512) 
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
 2014-08-28 10:23:40 -07:00
Robert Greenwalt
6afc1ac0d7 am 65ce2f17: am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '65ce2f1703a9e150e08cf3424e5e88bb84cae81c':
  Clean up Connectivity Logging.
 2014-08-28 17:10:53 +00:00
Robert Greenwalt
c8ff9c4d9f am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '709b97402db136331f2a58c1a0b612b4f0fed365':
  Clean up Connectivity Logging.
 2014-08-28 16:54:42 +00:00
Robert Greenwalt
2836dbb953 Merge "Clean up Connectivity Logging." into lmp-dev 2014-08-28 16:29:55 +00:00
Terry Heo
959d2db12c CEC: Implement dump() of HdmiControlService 
In addition, use hexadecimal address representation in HdmiPortInfo.toString()

Bug: 17310007
Change-Id: Iaba8f718f86a18a23b50f983053c7589dcdcfaf8
 2014-08-28 19:07:59 +09:00
Jae Seo
f565c3569a am 2eba45ce: am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '2eba45cea451399c9da75601524eb0ded2aa2875':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 09:41:29 +00:00
Jae Seo
73f61292ad am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit 'e1c0d6f0a03b09debe9a0b5e735f368ea1eceef2':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 05:14:05 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Jinsuk Kim
da1fa7bcaa am 90b50ad5: am 58afc5c4: am 235b2e66: Merge "CEC: return non-null MHL controller when not ready" into lmp-dev 
* commit '90b50ad5fef035cc83da8ecb9dde6249b9db5064':
  CEC: return non-null MHL controller when not ready
 2014-08-28 04:17:27 +00:00
Dongwon Kang
d170d13d99 am fbca19aa: am 4146f007: am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit 'fbca19aa212fd6aca7ec4c8412cb6d8f3c34757f':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 04:17:11 +00:00
Michael Wright
cb14761ed4 am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f06b6386de250240cbaaa5cca922a4f9e8915680':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 04:17:06 +00:00