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

121949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
54f991375a am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '3747768bde14ff9db96279830f07602ec50544cc':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-10 15:59:59 -08:00
Craig Mautner
3747768bde Merge "Fix visibility of multiple non-fullscreen activities." 2014-01-10 23:55:44 +00:00
Dirk Dougherty
e55fd23f07 am 214f4a56: am cc33c350: am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update. 
* commit '214f4a56425142fb94f3f542f8c08a76cf846571':
  Doc change: dashboard update.
 2014-01-10 23:22:11 +00:00
Dirk Dougherty
214f4a5642 am cc33c350: am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update. 
* commit 'cc33c350df41ac0b3f08dcef287edd5406cdad85':
  Doc change: dashboard update.
 2014-01-10 23:18:09 +00:00
Dirk Dougherty
cc33c350df am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update. 
* commit 'd45a76db36854b4dc58f7c717f557311a9603f7a':
  Doc change: dashboard update.
 2014-01-10 23:15:13 +00:00
Craig Mautner
7ef6c04afd am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev 
* commit 'd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2':
  Remove misleading warnings.
 2014-01-10 23:10:20 +00:00
Dirk Dougherty
d45a76db36 am d8849489: am ccc5ca14: Doc change: dashboard update. 
* commit 'd8849489a79a6b46996f3192b92d5089521e9341':
  Doc change: dashboard update.
 2014-01-10 15:09:33 -08:00
Craig Mautner
d7c97a798f Merge "Remove misleading warnings." into klp-modular-dev 2014-01-10 23:06:50 +00:00
Dirk Dougherty
d8849489a7 am ccc5ca14: Doc change: dashboard update. 
* commit 'ccc5ca144c2d6e21df5118870d0a3f3c65055686':
  Doc change: dashboard update.
 2014-01-10 23:06:16 +00:00
Craig Mautner
330a6bd8a6 Remove misleading warnings. 
Error messages that are obsolete and/or incorrect.

Fixes bug 12421138.

Change-Id: I43f095048757f7ae9bff47abed594dd34d8387ce
 2014-01-10 15:05:29 -08:00
Dirk Dougherty
ccc5ca144c Doc change: dashboard update. 
Change-Id: Ic65cd8d6bf2435fa3efd73f3337c462c02a752ed
 2014-01-10 15:00:16 -08:00
Alan Viverette
6ae1bdebf3 Merge "Revert "Fixing Drawable methods for find by layer ID and invalidation callback"" 2014-01-10 22:52:51 +00:00
Alan Viverette
218974915a Revert "Fixing Drawable methods for find by layer ID and invalidation callback" 
This reverts commit 8f164f64ec55a973fc043de932d853dd41772e4e.

Change-Id: I35637dee7b58c77387f375de585713ff76d4dd87
 2014-01-10 22:52:42 +00:00
Marco Nelissen
ece709670d Merge "Make MtpDatabase use libexif instead of libjhead" 2014-01-10 22:38:33 +00:00
Fabrice Di Meglio
559c1782ad Merge "Code cleaning for PreferenceActivity" 2014-01-10 22:23:19 +00:00
Alan Viverette
7682e03964 Merge "Fixes for DrawableContainer, LayerDrawable" 2014-01-10 22:10:14 +00:00
Alan Viverette
d4334718c7 Merge "Fixing Drawable methods for find by layer ID and invalidation callback" 2014-01-10 22:09:40 +00:00
David Christie
8785a608b9 am 797a82b4: am 881e1fe7: am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disab 
* commit '797a82b44d94d0cb4b036272dabdb8a18ac17a7e':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 21:43:50 +00:00
David Christie
797a82b44d am 881e1fe7: am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 1211 
* commit '881e1fe733744d2f3fe5d26e9612b36eb791757e':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 21:41:24 +00:00
David Christie
881e1fe733 am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'dc622f5e117031b494de750ab7729b07aa787243':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 21:37:40 +00:00
David Christie
dc622f5e11 am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '36788815be0e9c2d12cdc44d186f0cbe6a9e7122':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:34:13 -08:00
Craig Mautner
d4abbb964b am 93884a5b: Fix invalid stackId bug. 
* commit '93884a5b35ec97a0f44795950363188d9a21137a':
  Fix invalid stackId bug.
 2014-01-10 21:32:21 +00:00
David Christie
36788815be am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:30:36 -08:00
Craig Mautner
93884a5b35 Fix invalid stackId bug. 
Eliminate race condition by executing window manager createStack
directly from activity manager.

Change-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92
 2014-01-10 13:28:10 -08:00
David Christie
a4bd593155 am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'c454bbe805bd6ed096ec6b4b811c4e4b67a86225':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:27:26 -08:00
David Christie
c454bbe805 am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'b15429a6853472207c2a4aefd22dd009e851edb7':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:24:05 -08:00
David Christie
b15429a685 am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:18:58 -08:00
David Christie
503c5a32a4 am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:14:04 -08:00
David Christie
ea47cb6763 am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:10:12 -08:00
David Christie
bf6cecc21f am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:05:35 -08:00
David Christie
5716e4bfb9 am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:02:48 -08:00
David Christie
776b3956a9 am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:00:09 -08:00
David Christie
7f4d82932c am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:55:24 -08:00
Tim Murray
291d64685d Merge "Fix debug context." 2014-01-10 20:37:12 +00:00
Tim Murray
45fbe0e7ba Merge "Enable asynchronous destruction of BaseObjs." 2014-01-10 20:37:02 +00:00
Tim Murray
5eaf468434 Fix debug context. 
bug 12477551

Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
 2014-01-10 11:25:52 -08:00
Craig Mautner
1f7488e219 resolved conflicts for merge of 4504de5d to master 
Change-Id: I8d96fd2b479aebd6de913e617ca190f66c25aaa5
 2014-01-10 11:15:19 -08:00
John Spurlock
b0574ac0a3 Merge "Use custom classloader if provided for Serializables." 2014-01-10 18:59:03 +00:00
Craig Mautner
4504de5d5a Implement ActivityView. 
With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
 2014-01-10 10:54:55 -08:00
Glenn Kasten
fe834d30f4 Prepare for additional formats beyond 8-bit and 16-bit PCM 
This CL does the same thing for AudioTrack,
that an earlier CL did for AudioRecord:
  > Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f

Pull out the common parts of that earlier CL and move them to new header
file android_media_AudioFormat.h.

Use the new function audioFormatToNative() to convert from Java
ENCODING_PCM_* to native AUDIO_FORMAT_*.

Use audio_bytes_per_sample() instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: I7992dd6a2c9500126a6d7ae5fc1ed9f3312962d6
 2014-01-10 10:50:22 -08:00
Tim Murray
06b4567559 Enable asynchronous destruction of BaseObjs. 
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
 2014-01-10 10:39:38 -08:00
Marco Nelissen
3cd393c505 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-01-10 10:39:27 -08:00
John Spurlock
5002b8c972 Use custom classloader if provided for Serializables. 
If an explicit classloader is provided during unparcel, use it
when deserializing java serializables.

Change-Id: I2b354f0b55359201528234b8095aa0bc102928ec
 2014-01-10 13:34:00 -05:00
Adam Powell
fe9c354ccd am 9c9975ac: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev 
* commit '9c9975ac3dc63423751c4783162d4ade11d156c1':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-01-10 18:32:08 +00:00
Adam Powell
9c9975ac3d Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev 2014-01-10 18:30:23 +00:00
Craig Mautner
5ab77ac4a5 am 96ada57b: Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev 
* commit '96ada57b2c0c456e9d3a1f43e3ff691f14ec1459':
  Allow for the possibility of null ActivityContainer
 2014-01-10 18:27:49 +00:00
Craig Mautner
96ada57b2c Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev 2014-01-10 18:21:50 +00:00
Craig Mautner
bd503a4e3a Allow for the possibility of null ActivityContainer 
When BinderProxy is passed in as the IBinder for
getEnclosingActivityContainer the activity manager cannot turn it into
an ActivityRecord. This causes NPE in ActivityThread which is Not Good
(tm).

Allowing null to be returned when requesting an ActivityContainer and
handling it appropriately fixes this bug.

Fixes bug 12473669.

Change-Id: I6937636042f8853b3ddc2df40be010e7391e41a5
 2014-01-10 10:16:43 -08:00
Adam Powell
efc3bb0612 Fix a bug where OnTouchListeners in action views could be removed 
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
 2014-01-10 10:16:27 -08:00
Zhihai Xu
c9eff80eca Merge "Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" 2014-01-10 17:44:22 +00:00