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

128065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
b827f78e7a Merge "Removed android.debug.JNITest from preloaded-classes" 2014-04-10 11:18:28 +00:00
Narayan Kamath
d35d3e5d39 Dual zygote cleanup. 
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
  argument must be passed through to the java main class.

Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
 2014-04-10 12:15:39 +01:00
Narayan Kamath
2a6599d335 am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs
 2014-04-10 09:47:21 +00:00
Narayan Kamath
954a4666ab am d11f223c: resolved conflicts for merge of 286a247e to master 
* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
  Re-implement native library search and copies.
 2014-04-10 09:47:18 +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
1d26a3f1ef am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs
 2014-04-10 09:23:33 +00:00
Narayan Kamath
0fd40cb100 am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.
 2014-04-10 09:23:30 +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
e61981c06b am e5e8444c: Merge "Allow setting the active admin across users." 
* commit 'e5e8444ce864e7ac5d07308b9a5c5ca2caaa4e0a':
  Allow setting the active admin across users.
 2014-04-10 08:41:51 +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
ad9fa8b735 am 9ce83761: Merge "Camera2: Add MANUAL capture intent" 
* commit '9ce83761cc9908e6acad8af5ad45574163b28b19':
  Camera2: Add MANUAL capture intent
 2014-04-10 02:10:41 +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
f6a021c4c3 am 7e6fe14f: am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 
* commit '7e6fe14f0264cef4fa2e0e3bbe5ea26c9a211ec6':
  LE: Return false if an attribute read/write is in progress
 2014-04-10 01:13:51 +00:00
Jesse Gunsch
db3e0655d5 am ece41093: am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 
* commit 'ece410939fbb7a463c79ea63adf3b96c12dc386e':
  Merge "NsdService does not clean up after exiting clients"
 2014-04-10 01:13:48 +00: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
Jesse Gunsch
ece410939f am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 
* commit '3c1c137579783fad81169da01d5c7c5819c81b07':
  Merge "NsdService does not clean up after exiting clients"
 2014-04-10 01:07:23 +00:00
John Reck
04c9040491 am 9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree" 
* commit '9817ddd420aaa885f92f778ae2cfd17e6a71bc87':
  Merge hasFunctors & pushStaging into prepareTree
 2014-04-10 00:16:52 +00:00
John Reck
9817ddd420 Merge "Merge hasFunctors & pushStaging into prepareTree" 2014-04-10 00:14:10 +00:00
Adrian Roos
898fe18101 Merge "Keep lockscreen open when all notifications are gone" into master-lockscreen-dev 2014-04-10 00:08:22 +00:00
Deepanshu Gupta
def26cb43b am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib" 
* commit '8aa7a9677af8f235ade204602014a5e2e9f9188e':
  Support custom views using TimePickerDialog in layoutlib
 2014-04-10 00:02:34 +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
Adrian Roos
2718e1f3a3 Keep lockscreen open when all notifications are gone 
Whack-a-bug time!

Bug: 13635952
Change-Id: I1941271fb1638cc60f1a1311369b4703ff83c76b
 2014-04-10 01:59:57 +02:00
Deepanshu Gupta
8aa7a9677a Merge "Support custom views using TimePickerDialog in layoutlib" 2014-04-09 23:59:26 +00:00
Alan Viverette
a11f8b50a8 am 5062649a: Merge "Update list item text appearance" 
* commit '5062649abac9bf873123fe560fbb7b0748b30a54':
  Update list item text appearance
 2014-04-09 23:58:39 +00:00
Adrian Roos
9a254ac907 Merge "Allow returning from quick settings on lockscreen" into master-lockscreen-dev 2014-04-09 23:57:35 +00:00
Jeff Brown
6ca5f8cd78 am 30439d62: am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
* commit '30439d62d28d1368b68c59e77fb1bcf6be1d8fbe':
 2014-04-09 23:54:55 +00:00
Winson Chung
46c747ba09 am 2835db8b: Merge "Removing duplicated code in Recents" 
* commit '2835db8b62ec8cb15369a96da6d7b97122d395fb':
  Removing duplicated code in Recents
 2014-04-09 23:54:52 +00:00
Winson Chung
00cecfbb32 am 2adb9586: Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view." 
* commit '2adb95860f9682ed2c4893da58679540cd8cac56':
  Allow for different rects when animating to a single task stack view and a multiple task stack view.
 2014-04-09 23:54:49 +00: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
Svetoslav
6360d29cd7 am bc1a8f42: Merge "Active window not correctly computed." 
* commit 'bc1a8f42d9eb5f1d91c872904a9a283781291fcb':
  Active window not correctly computed.
 2014-04-09 23:51:12 +00:00
Jeff Brown
30439d62d2 am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
* commit '6fdb5e6df178b3b1062ac67b505b288aa609a66b':
 2014-04-09 23:50:47 +00: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
Winson Chung
2835db8b62 Merge "Removing duplicated code in Recents" 2014-04-09 23:50:39 +00:00
Jesse Gunsch
3c1c137579 am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 
* commit '8d31358fb4f0f948fcfd07399d4247375dc5eea9':
  Merge "NsdService does not clean up after exiting clients"
 2014-04-09 23:50:35 +00:00
Winson Chung
2adb95860f Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view." 2014-04-09 23:50:33 +00:00
Svetoslav
bc1a8f42d9 Merge "Active window not correctly computed." 2014-04-09 23:48:41 +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
Svetoslav
48eacec53e Active window not correctly computed. 
The accessibility manager service was not handling the focused
window properly which as a result was breaking the active window
tracking.

bug:13788022

Change-Id: Iaa3fadfbf7b9545f5151e3603beeda2662fe7618
 2014-04-09 16:45:49 -07:00
John Reck
615c946448 am 8e1f9187: Merge "Switch DisplayListData to a staging model" 
* commit '8e1f918738abf70a4dc86dbb12b386a9deea37f8':
  Switch DisplayListData to a staging model
 2014-04-09 23:03:09 +00:00
John Reck
8e1f918738 Merge "Switch DisplayListData to a staging model" 2014-04-09 23:01:02 +00:00
Adrian Roos
0e1a96a1b6 Merge "Protect WindowManager's PRIVATE_FLAG_KEYGUARD" into master-lockscreen-dev 2014-04-09 22:48:47 +00:00
John Reck
8de65a8e05 Switch DisplayListData to a staging model 
Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
 2014-04-09 15:48:00 -07:00
Adrian Roos
3bc62f724b Allow returning from quick settings on lockscreen 
Turns out having to switch off the device to get back to notifications
is annoying.

Bug: 13635952
Change-Id: I9db81370c7c715a0874e2b6a4d75ed408843868a
 2014-04-10 00:44:43 +02:00