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

130183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Charlton
e9aa1aaa25 Expose CallState.NEW 
Expose CallState.NEW so that we have a state before DIALING. Immediately
transitioning calls to DIALING is wrong, because that shouldn't happen
until the CallService is actually dialing.

Bug: 13902624

Change-Id: Id5ee0d4d050deb2f3038f3de8fdd265caa75f7b2
 2014-04-10 09:27:07 -07:00
Alan Viverette
f7dd84ee48 am 03bdcfa5: Merge "Ensure theme attributes are set appropriately" 
* commit '03bdcfa519766ffe9d331d176eae8c77452bc4ff':
  Ensure theme attributes are set appropriately
 2014-04-09 20:43:57 +00:00
Alan Viverette
03bdcfa519 Merge "Ensure theme attributes are set appropriately" 2014-04-09 20:37:20 +00:00
Fabrice Di Meglio
3654de0b02 am 03fee276: Merge "Update SearchIndexablesContract" 
* commit '03fee27646564cf1b559b7f8a53d35a1db18d0bd':
  Update SearchIndexablesContract
 2014-04-09 20:33:56 +00:00
Fabrice Di Meglio
03fee27646 Merge "Update SearchIndexablesContract" 2014-04-09 20:29:19 +00:00
Fabrice Di Meglio
1ecde22134 Update SearchIndexablesContract 
- add indices constants for colums
- add missing properties (entries / key)

Change-Id: Ie6c00abf27aaf0fc27e685c8ee0ff8e1e16b5d52
 2014-04-09 13:17:42 -07:00
Alan Viverette
d722e59984 am 514d4aaf: Merge "Update supported Drawable tinting modes and docs" 
* commit '514d4aaf53abf6671b0fe8be6d8a2d6b2a69b887':
  Update supported Drawable tinting modes and docs
 2014-04-09 20:12:03 +00:00
Alan Viverette
5b6b1bb97b Ensure theme attributes are set appropriately 
BUG: 13920927
Change-Id: I0ddb3e3c5ca56cce3110c6b85959f2c22671e079
 2014-04-09 13:09:15 -07:00
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
5e75df5218 am b06cb887: Skip cleaning up TV service/session when the user state is not found 
* commit 'b06cb8870f0407f18bb1225065a93aba2a5de2bf':
  Skip cleaning up TV service/session when the user state is not found
 2014-04-09 19:35:21 +00: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
a4b0ef8802 am 8d637b81: Camera2: Fix the JPEG format issues 
* commit '8d637b819b23d0fcca87a39d26d0350e062852f4':
  Camera2: Fix the JPEG format issues
 2014-04-09 18:54:33 +00: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
6de57fd243 am 972d0488: Merge "When recording a child node into a parent, read staging projection property" 
* commit '972d0488a555ff65a9e18655795e65e4b5365175':
  When recording a child node into a parent, read staging projection property
 2014-04-09 18:14:00 +00:00
John Reck
7f31228548 am a040977d: Merge "Fix ThreadedRenderer.setEnabled()" 
* commit 'a040977de8b3ec791bf3b7e0115630e8c27fd8ca':
  Fix ThreadedRenderer.setEnabled()
 2014-04-09 18:13:57 +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
d6bb4d92b2 am daa610cc: Merge "Prevent Recents from lingering after screen-off." 
* commit 'daa610cc42ae68db0af1b63755fe3a7531f47dcc':
  Prevent Recents from lingering after screen-off.
 2014-04-09 17:44:11 +00:00
Winson Chung
daa610cc42 Merge "Prevent Recents from lingering after screen-off." 2014-04-09 17:39:31 +00:00
Jean-Michel Trivi
60f10d70b0 am c4200b72: Merge "Audio focus doesn\'t affect RemoteController" 
* commit 'c4200b72d83b50b970ccd156a5b4715fecef7024':
  Audio focus doesn't affect RemoteController
 2014-04-09 16:57:22 +00:00
Jean-Michel Trivi
c4200b72d8 Merge "Audio focus doesn't affect RemoteController" 2014-04-09 16:51:52 +00:00
Mark Salyzyn
40609a7019 am 1b1c0218: am 280fe930: am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect" 
* commit '1b1c021858daca0e77c106503798c2c47cb372b4':
  jni: liblog reading error API incorrect
 2014-04-09 16:24:58 +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
a17e83ff01 am 10bdb4b9: am 769a2475: am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes." 
* commit '10bdb4b9e966f0a3d8e1099bf8eff4c41c31981c':
  Allow connections to multiple zygotes.
 2014-04-09 14:30:33 +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
9f07e4fb46 am 7be06900: am 9f777008: am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs." 
* commit '7be06900a824babd17c5f4e018c08aeca9ba57e3':
  Make zygotes aware of their supported ABIs.
 2014-04-09 14:12:27 +00:00
Narayan Kamath
bb44770546 am 8ee0b48d: am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args." 
* commit '8ee0b48d607fd6afc5e75f56bdadce19272c60ff':
  Clean up argc / argv processing for runtime args.
 2014-04-09 14:12:24 +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
7f74afac6d am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
  Move certain internal activity manager methods to new class.
 2014-04-09 14:04:15 +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
3ff279dca8 am 33ea32fd: am dc7eb9c9: am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." 
* commit '33ea32fd4e5edd7920adecd17ca69defd0c4ba93':
  Don't allow MemoryFiles of negative length.
 2014-04-09 12:26:54 +00: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