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

127424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
514d4aaf53 Merge "Update supported Drawable tinting modes and docs" 2014-04-09 20:08:46 +00:00
Alan Viverette
2f8ba8f7fa Update supported Drawable tinting modes and docs 
Change-Id: I9c20d2bc4dc499f91c21a348871cf209c1065ba6
 2014-04-09 13:00:17 -07:00
Jae Seo
b06cb8870f Skip cleaning up TV service/session when the user state is not found 
Bug: 13930813
Change-Id: I64285edaca0bd06d6f6efaeb6b5c30c2ef762902
 2014-04-09 12:10:58 -07:00
Zhijun He
8d637b819b Camera2: Fix the JPEG format issues 
Also add unit test.

Bug: 13836016

Change-Id: I0af4bfe299f99c99e70faf5d3159eb0cbcc147eb
 2014-04-09 18:51:38 +00:00
Chris Craik
972d0488a5 Merge "When recording a child node into a parent, read staging projection property" 2014-04-09 18:10:28 +00:00
John Reck
a040977de8 Merge "Fix ThreadedRenderer.setEnabled()" 2014-04-09 18:10:28 +00:00
John Reck
f7d9c1dc84 Fix ThreadedRenderer.setEnabled() 
Bug: 13914116
 Fixes lifecycle issues around setEnabled where ThreadedRenderer
 was reporting as being enabled before it had a Surface. This is
 incorrect.

 Also fix some EGL lifecycle issues

Change-Id: I12ebb279707f9b533a570b61d68735d858b560bf
 2014-04-09 11:01:29 -07:00
Winson Chung
daa610cc42 Merge "Prevent Recents from lingering after screen-off." 2014-04-09 17:39:31 +00:00
Jean-Michel Trivi
c4200b72d8 Merge "Audio focus doesn't affect RemoteController" 2014-04-09 16:51:52 +00:00
Mark Salyzyn
1b1c021858 am 280fe930: am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect" 
* commit '280fe930a432d9e2ead8c4b58ce76a0ee45742e7':
  jni: liblog reading error API incorrect
 2014-04-09 16:19:47 +00:00
Mark Salyzyn
280fe930a4 am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect" 
* commit '7a67c927e622bb176b21455b8ed56c76b8e0f602':
  jni: liblog reading error API incorrect
 2014-04-09 16:14:41 +00:00
Mark Salyzyn
7a67c927e6 am ecdf9b19: Merge "jni: liblog reading error API incorrect" 
* commit 'ecdf9b199ac9659c37c34c0b23084199acea80bf':
  jni: liblog reading error API incorrect
 2014-04-09 16:11:04 +00:00
Mark Salyzyn
ecdf9b199a Merge "jni: liblog reading error API incorrect" 2014-04-09 16:07:48 +00:00
Narayan Kamath
10bdb4b9e9 am 769a2475: am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes." 
* commit '769a247595cb78536fa159e8f5d54191a4ef90c6':
  Allow connections to multiple zygotes.
 2014-04-09 14:24:56 +00:00
Narayan Kamath
769a247595 am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes." 
* commit 'b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3':
  Allow connections to multiple zygotes.
 2014-04-09 14:19:46 +00:00
Narayan Kamath
b6ab8c17bd am a6f5e79d: Merge "Allow connections to multiple zygotes." 
* commit 'a6f5e79dd182b05909fa53109e74638afcd7ee12':
  Allow connections to multiple zygotes.
 2014-04-09 14:15:16 +00:00
Narayan Kamath
a6f5e79dd1 Merge "Allow connections to multiple zygotes." 2014-04-09 14:12:23 +00:00
Narayan Kamath
4444dcd0ad Allow connections to multiple zygotes. 
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.

Both zygotes are assumed to be active at all points.

Change-Id: I460319b4481ff1c1666e8172223691820658a35c
 2014-04-09 15:07:10 +01:00
Narayan Kamath
7be06900a8 am 9f777008: am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs." 
* commit '9f777008eaead3cb9cee80d0c00e5a3d55de9de7':
  Make zygotes aware of their supported ABIs.
 2014-04-09 14:06:14 +00:00
Narayan Kamath
8ee0b48d60 am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args." 
* commit '97175deb446cdaca7f3910b71940cb443bda3cc4':
  Clean up argc / argv processing for runtime args.
 2014-04-09 14:06:10 +00:00
Narayan Kamath
9f777008ea am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs." 
* commit '05f980d42d4926ab2130cdcf9e646eb610a7080b':
  Make zygotes aware of their supported ABIs.
 2014-04-09 14:02:18 +00:00
Narayan Kamath
97175deb44 am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args." 
* commit '3856a219fa414ee53c5ef3a0c35dae35e2ca80b1':
  Clean up argc / argv processing for runtime args.
 2014-04-09 14:02:08 +00:00
Narayan Kamath
05f980d42d am d4b64409: Merge "Make zygotes aware of their supported ABIs." 
* commit 'd4b644092e8d2719d01ad297b080bd50b1fdf60d':
  Make zygotes aware of their supported ABIs.
 2014-04-09 13:59:00 +00:00
Narayan Kamath
3856a219fa am cecfb94f: Merge "Clean up argc / argv processing for runtime args." 
* commit 'cecfb94f3f1b2978ba66342d7920e83770c808e3':
  Clean up argc / argv processing for runtime args.
 2014-04-09 13:58:57 +00:00
Narayan Kamath
a981e3b01a resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
 2014-04-09 14:57:59 +01:00
Narayan Kamath
d4b644092e Merge "Make zygotes aware of their supported ABIs." 2014-04-09 13:55:58 +00:00
Narayan Kamath
cecfb94f3f Merge "Clean up argc / argv processing for runtime args." 2014-04-09 13:55:54 +00:00
Narayan Kamath
c41638cb75 Make zygotes aware of their supported ABIs. 
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.

Also add a new Zygote command that returns this list of
ABIs to peers.

Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
 2014-04-09 13:41:15 +01:00
Narayan Kamath
22ec1eefa4 Clean up argc / argv processing for runtime args. 
- Make copies of argc, argv before argv is potentially
  overwritten with the process name.
- Allow multiple command line arguments to be passed to
  ZygoteInit (this is required for some of the 64 bit
  zygote work).
- Add an explanatory comment about how these argments
  are processed.

Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
 2014-04-09 13:39:41 +01:00
Narayan Kamath
33ea32fd4e am dc7eb9c9: am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." 
* commit 'dc7eb9c947f36cbd34021663845bcbb090c3169d':
  Don't allow MemoryFiles of negative length.
 2014-04-09 12:20:01 +00:00
Kenny Guy
9d43dc5e4e Merge "Finish rename of related users to profiles." 2014-04-09 11:42:40 +00:00
Narayan Kamath
dc7eb9c947 am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." 
* commit '00cfbe82fa80ef57f3b1c34e47836d3e28c381b8':
  Don't allow MemoryFiles of negative length.
 2014-04-09 11:33:20 +00:00
Yohann Roussel
900224afc2 Merge "A stress test for concurent multidex extraction." 2014-04-09 09:49:58 +00:00
Jeff Brown
50807c178f am 7f9599d6: (-s ours) am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev 
* commit '7f9599d63c892934c7f8a2e46d1e518ddb0d43df':
  Move display power controller to display manager service. (DO NOT MERGE)
 2014-04-09 09:17:10 +00:00
Sander Alewijnse
c03dea7630 Merge "Changed tag name and error strings for PersistentPreferredActivity storage." 2014-04-09 09:14:50 +00:00
Jeff Brown
7f9599d63c am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev 
* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
  Move display power controller to display manager service. (DO NOT MERGE)
 2014-04-09 09:12:40 +00:00
Narayan Kamath
00cfbe82fa am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." 
* commit 'a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0':
  Don't allow MemoryFiles of negative length.
 2014-04-09 09:09:58 +00:00
Narayan Kamath
a5608acbd7 Merge "Don't allow MemoryFiles of negative length." 2014-04-09 09:07:29 +00:00
Jeff Brown
7289f3ab8f Merge "Move certain internal activity manager methods to new class." into klp-modular-dev 2014-04-09 04:36:51 +00:00
Jeff Brown
1b03d16011 Merge "Move display power controller to display manager service." 2014-04-09 04:36:22 +00:00
Jeff Brown
131206b8a9 Move display power controller to display manager service. 
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
 2014-04-08 21:34:32 -07:00
Jeff Brown
ea72cdf22f Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev 2014-04-09 04:33:27 +00:00
Jeff Brown
13014b5fe5 Move certain internal activity manager methods to new class. 
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
 2014-04-08 20:51:07 -07:00
Jeff Brown
ad9ef191f5 Move display power controller to display manager service. (DO NOT MERGE) 
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
 2014-04-08 20:41:46 -07:00
Tor Norbye
37eaebe7f2 Merge "Add resource reference annotations" 2014-04-09 01:37:43 +00:00
Chris Craik
defb7f37fe When recording a child node into a parent, read staging projection property 
bug:13770920

The other properties should not be read from the UI thread.

Change-Id: I61d13774553d46a8963623727d8e8eeeb3385cc9
 2014-04-08 18:17:07 -07:00
Zhijun He
d178496b7e Camera2: Make colorFilterArrangement public 
It will be used by DNG

Also fix a typo in spec.

Change-Id: I8427df6b28149c0f8ced27b110efe96dd38357f4
 2014-04-09 00:50:00 +00:00
Amith Yamasani
cc4e9e69d2 Merge "Avoid security exception when requesting badging" 2014-04-09 00:26:18 +00:00
Amith Yamasani
5abdbb6560 Avoid security exception when requesting badging 
When requesting badged icons, use APIs that don't require the caller
to have MANAGE_USERS permission.

Change-Id: I218cdf5194f38f4affa1874a6fcb43a040ed5295
 2014-04-08 17:23:46 -07:00
Alan Viverette
91c8f753ab Merge "Theming for more VectorDrawable attrs, add attrs to test app" 2014-04-09 00:16:56 +00:00