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

49027 Commits

Author SHA1 Message Date
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
John Reck
d3d8dafc2f Make attachFunctor blocking 
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
 2014-04-10 15:00:13 -07:00
Jianing Wei
dcb495ff86 Merge "Camera2 API: enable burst capture and repeating burst." 2014-04-10 19:51:57 +00:00
Jianing Wei
d2c3a825cd Camera2 API: enable burst capture and repeating burst. 
*  Enable sending out burst requests, canceling, and flushing.
*  Enable onCaptureStarted, onResultReceived for bursts.
*  Enable onCaptureSequenceCompleted by tracking frame number.

Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340
Bug-ID: 10749500
 2014-04-10 19:50:04 +00:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Chris Wren
2bb8dde44b Merge "support the people extra on the notification object" 2014-04-10 19:18:31 +00:00
Chris Wren
dde753079f support the people extra on the notification object 
currently supported URIs:
  content://com.android.contacts/contacts/lookup/*
  tel:*

Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
 2014-04-10 15:18:25 -04:00
Baligh Uddin
8c22e36742 Merge "Import translations. DO NOT MERGE" 2014-04-10 15:51:35 +00:00
Paul Lawrence
9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection" 2014-04-10 14:30:53 +00:00
Narayan Kamath
f148f36d14 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
 2014-04-10 09:45:18 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master 
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
 2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
 2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
 2014-04-10 09:26:44 +00:00
Narayan Kamath
09e13cc5f9 Merge "System services detect and register app CPU ABIs" 2014-04-10 09:20:22 +00:00
Narayan Kamath
80413c9fe1 Merge "Re-implement native library search and copies." 2014-04-10 09:19:38 +00:00
Jessica Hummel
e5e8444ce8 Merge "Allow setting the active admin across users." 2014-04-10 08:16:28 +00:00
Jessica Hummel
6d36b60beb Allow setting the active admin across users. 
This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile.

Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400
 2014-04-10 08:15:42 +00:00
Zhijun He
9ce83761cc Merge "Camera2: Add MANUAL capture intent" 2014-04-10 02:07:37 +00:00
Zhijun He
e30adb762a Camera2: Add MANUAL capture intent 
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
 2014-04-09 19:04:31 -07:00
Zhihai Xu
7e6fe14f02 am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 
* commit '544991946287bdd3a9e6a71855642e378594bf73':
  LE: Return false if an attribute read/write is in progress
 2014-04-10 01:07:26 +00:00
John Reck
9817ddd420 Merge "Merge hasFunctors & pushStaging into prepareTree" 2014-04-10 00:14:10 +00:00
John Reck
f4198b713e Merge hasFunctors & pushStaging into prepareTree 
Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
 2014-04-09 17:00:04 -07:00
Alan Viverette
5062649aba Merge "Update list item text appearance" 2014-04-09 23:54:24 +00:00
Alan Viverette
55565ecd46 Update list item text appearance 
Adds a new attribute for secondary list item text and points
the Gingerbread and Holo themes to use TextAppearance.Small for
compatibility's sake.

Change-Id: I8e78a908b699baae6d1f5b3623fd7b5648b99b77
 2014-04-09 16:52:54 -07:00
Zhihai Xu
5449919462 am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 
* commit '2e8a2d207f446e156a8cfb9532cdfb569caa9458':
  LE: Return false if an attribute read/write is in progress
 2014-04-09 23:50:39 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
 2014-04-09 16:47:40 -07:00
John Reck
8e1f918738 Merge "Switch DisplayListData to a staging model" 2014-04-09 23:01:02 +00:00
John Reck
8de65a8e05 Switch DisplayListData to a staging model 
Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
 2014-04-09 15:48:00 -07:00
Alan Viverette
03bdcfa519 Merge "Ensure theme attributes are set appropriately" 2014-04-09 20:37:20 +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
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
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
Zhihai Xu
2e8a2d207f Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 2014-04-09 18:19:04 +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
Andre Eisenbach
cc68cc962d LE: Return false if an attribute read/write is in progress 
bug:12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
 2014-04-09 10:59:44 -07:00
Baligh Uddin
3295b9660c Import translations. DO NOT MERGE 
Change-Id: Icfa0a9064725819067d4034e99728ecb5ddd4001
Auto-generated-cl: translation import
 2014-04-09 10:22:03 -07:00
Ramin Zaghi
ff0c470833 System services detect and register app CPU ABIs 
This patch uses the NativeLibraryHelper class to
match native libraries in an .apk package with
those listed in 'ro.cpu.abilist' property.
The result is stored in packages.xml and the
ApplicationInfo class.

This information will be used by the ActivityManager
to decide which zygote to use to launch the given
app.

Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
 2014-04-09 17:20:13 +01: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
Ramin Zaghi
1378aba7ae Re-implement native library search and copies. 
We now use a two step approach :

- First we look through the list of shared libraries in an
  APK, and choose an ABI based on the (priority)  list of ABIs
  a given device supports.
- Then we look through the list of shared libraries and copy
  all shared libraries that match the ABI we've selected.

This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.

The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).

bug: https://code.google.com/p/android/issues/detail?id=65053
bug: 13647418

Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
 2014-04-09 17:16:40 +01: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
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
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