Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,994 Commits 3 Branches 0 Tags
deae1e11bf9d6ee40e70bee62d24dbcb01ef1b60
Commit Graph

112994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
deae1e11bf am b00e5cc6: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'b00e5cc610f24aca7e989db0ca552c952d2a924f':
  Add permissions for the InCallUI Split.
 2013-09-17 13:45:58 -07:00
Santos Cordon
b00e5cc610 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-17 20:43:04 +00:00
Michael Jurka
b35d94e721 am d1544e3f: Merge "Reduce memory usage of default thumbnail" into klp-dev 
* commit 'd1544e3f71d35b01e34bbf64720f260c8fa2a7e8':
  Reduce memory usage of default thumbnail
 2013-09-17 13:42:29 -07:00
Michael Jurka
d1544e3f71 Merge "Reduce memory usage of default thumbnail" into klp-dev 2013-09-17 20:40:34 +00:00
Craig Mautner
e3c9ae67bb am 16efe96c: Merge "Fix parenthetical error." into klp-dev 
* commit '16efe96cbc570ebd2fe7e823080ba4174fbb3cbe':
  Fix parenthetical error.
 2013-09-17 13:25:41 -07:00
Craig Mautner
16efe96cbc Merge "Fix parenthetical error." into klp-dev 2013-09-17 20:21:40 +00:00
Dianne Hackborn
0c95b8c824 am 463850e0: Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev 
* commit '463850e0c658b37bbe29b9e9dec6ff7565bb883f':
  Fix issue #10795385: System process crash reinstalling GEL -
 2013-09-17 11:09:32 -07:00
John Spurlock
b6ac744b11 am 80645121: Merge "BatteryMeterView: Charging trumps empty." into klp-dev 
* commit '80645121fbba6f038feb48026d935b31028463d7':
  BatteryMeterView: Charging trumps empty.
 2013-09-17 11:09:29 -07:00
Dianne Hackborn
463850e0c6 Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev 2013-09-17 18:08:00 +00:00
John Spurlock
80645121fb Merge "BatteryMeterView: Charging trumps empty." into klp-dev 2013-09-17 18:07:25 +00:00
Dianne Hackborn
e56c2c3f05 Fix issue #10795385: System process crash reinstalling GEL - 
NPE at com.android.server.am.ProcessRecord.resetPackageList(ProcessRecord.java:596)

Take care of some more cases now that baseProcessTracker can be null.

Change-Id: I394c0b7802788118c3ad6bcac5dfdd23eeda8d58
 2013-09-17 11:03:10 -07:00
Craig Mautner
7504d7b24a Fix parenthetical error. 
Mis-grouping of && and || from CL ag/360551.

Fixes bug 10798273.

Change-Id: Idbc77e03d09f7ad5fcf1a5de98c6c14f0c63a6e4
 2013-09-17 10:50:53 -07:00
Craig Mautner
c37b3705d8 am fbd67258: Merge "More debugging for b/106899184" into klp-dev 
* commit 'fbd67258e13d919f83f66f4e8a948f86aa507c26':
  More debugging for b/106899184
 2013-09-17 10:40:56 -07:00
Craig Mautner
fbd67258e1 Merge "More debugging for b/106899184" into klp-dev 2013-09-17 17:39:08 +00:00
Craig Mautner
b1885b8588 More debugging for b/106899184 
Change-Id: I729a2c5bae087713765d782daaa7309ee6cd5b5a
 2013-09-17 09:35:20 -07:00
Dirk Dougherty
a90a1bd8c0 am 6df7d4a5: am a621cfe8: am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit '6df7d4a574ffd85c82cad402552e3854df3a3f85':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:27:51 -07:00
Dirk Dougherty
6df7d4a574 am a621cfe8: am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit 'a621cfe84fcdab3b4e956148203be66e158316da':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:25:31 -07:00
Michael Jurka
9926272f32 Reduce memory usage of default thumbnail 
Bug: 10639174

Change-Id: I2b7f3844e77427d2327a7d89c63e4f3b0d890bc0
 2013-09-17 18:24:47 +02:00
Dirk Dougherty
a621cfe84f am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit 'fe790af5897a9c466b5b0a79201ad7752782eaac':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:23:21 -07:00
Dirk Dougherty
fe790af589 am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit '1e6c936e84675925ef5c58a04c6e80d8894d7128':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:20:57 -07:00
Dirk Dougherty
1e6c936e84 Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 2013-09-17 16:17:58 +00:00
Dirk Dougherty
1ef5374793 Doc change: change initial quota limit for Google Play Developer API v1_1. 
Change-Id: I553bbe9794cfbeee0fc8ebeded5af9ce6256a975
 2013-09-17 09:13:29 -07:00
Jean-Michel Trivi
eded3b50d7 am 2a07bde6: Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 
* commit '2a07bde60732ac74920b5083295e9f7694d2bfcd':
  Public API for LoudnessEnhancer audio effect
 2013-09-17 09:02:29 -07:00
Jean-Michel Trivi
2a07bde607 Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 2013-09-17 16:00:07 +00:00
Amith Yamasani
6484c42eb4 am 33caca5c: Merge "Add a feature to specify if device admins are supported on the device" into klp-dev 
* commit '33caca5cd56ff41142cea121fabf5e30bebfb39f':
  Add a feature to specify if device admins are supported on the device
 2013-09-17 08:58:57 -07:00
Amith Yamasani
33caca5cd5 Merge "Add a feature to specify if device admins are supported on the device" into klp-dev 2013-09-17 15:56:14 +00:00
John Spurlock
d19877f8a3 BatteryMeterView: Charging trumps empty. 
Match the style implicit in the battery assets: if charging,
show the bolt, not the exclamation point.

Bug:10651062
Change-Id: I3edd822326ad611972e791cf4acc8c395e51a74d
 2013-09-17 11:03:03 -04:00
Baligh Uddin
be2683fab5 am fd111c8f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fd111c8f61b006e66a6670cbf4e1c579000ba3e3':
  Import translations. DO NOT MERGE
 2013-09-16 21:09:07 -07:00
Baligh Uddin
ddaaed406a am 5dd80754: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5dd80754a396c46b85ceaf7bd117c704413d2894':
  Import translations. DO NOT MERGE
 2013-09-16 21:09:04 -07:00
Baligh Uddin
de865169fd am eedb4f8f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'eedb4f8f857e83ab67d22d36da77dc9b3c8a5bcc':
  Import translations. DO NOT MERGE
 2013-09-16 21:09:01 -07:00
Baligh Uddin
72a6213e46 am 5a9948e1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5a9948e1b9a3fad6b95d7cddae2306c0200f28d3':
  Import translations. DO NOT MERGE
 2013-09-16 21:08:59 -07:00
Baligh Uddin
fd111c8f61 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:05:19 +00:00
Baligh Uddin
5dd80754a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:05:05 +00:00
Baligh Uddin
eedb4f8f85 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:04:51 +00:00
Baligh Uddin
5a9948e1b9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:04:23 +00:00
Svetoslav
e7d3408652 am be0d9317: Merge "App UI freezes when printing. API clean up." into klp-dev 
* commit 'be0d9317e27b600eee7deb8f328358cdb38115c6':
  App UI freezes when printing. API clean up.
 2013-09-16 19:30:50 -07:00
Svetoslav
be0d9317e2 Merge "App UI freezes when printing. API clean up." into klp-dev 2013-09-17 02:28:34 +00:00
Dianne Hackborn
9202e085d2 am a0d53c61: Merge "Fix issue #10779747: Calendar Storage crash observed..." into klp-dev 
* commit 'a0d53c61886b683b0cc9dccdb5b6fe581356b920':
  Fix issue #10779747: Calendar Storage crash observed...
 2013-09-16 19:16:41 -07:00
Christopher Tate
0ff08a6079 am ca776158: Merge "Don\'t assume that transport unbind == transport invalid" into klp-dev 
* commit 'ca776158b7be48d8cba862fccf7b9709856ae61a':
  Don't assume that transport unbind == transport invalid
 2013-09-16 19:13:14 -07:00
Dianne Hackborn
a0d53c6188 Merge "Fix issue #10779747: Calendar Storage crash observed..." into klp-dev 2013-09-17 02:12:58 +00:00
Christopher Tate
ca776158b7 Merge "Don't assume that transport unbind == transport invalid" into klp-dev 2013-09-17 02:10:40 +00:00
Zhijun He
6ab1f2355c am 48811160: Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 
* commit '4881116047f72f4406cb88cbb2f324c06f9a292f':
  ImageReader: fix the 0 crop rect size issue
 2013-09-16 19:09:46 -07:00
Zhijun He
4881116047 Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 2013-09-17 02:07:21 +00:00
Dianne Hackborn
0d97cd1f6a Fix issue #10779747: Calendar Storage crash observed... 
...while setting up a new user from settings.

The delayed service start stuff was too aggressive -- it would
allow a process to be killed between the an onReceive() that calls
startService() and that service being started.  This means that
apps that set up global state that they expect to remain set up
during that time could be lost.

This is the first part of a fix, which tightens up when we allow
services to be delayed.  Now we will immediately start the service
as long as it currently as a process running that is not in the
cached state.  (Previously we would delay if the process was in
the receiver state.)

This unfortunately means that our service start delay is much
less effective.  To address that, there will be a follow-on change
to tie broadcast delivery into this to see if we can delay the
finish of a broadcast as long as there are background services
starting in that process.

Change-Id: I2bba2295d10699ee3479375bbe87114b2cbb0826
 2013-09-16 19:02:52 -07:00
Dianne Hackborn
bb7a51e1ef am 8a7a93e2: Merge "Work on issue #10771346: runtime restart" into klp-dev 
* commit '8a7a93e20d8755602938a56d4a88398baf2359e4':
  Work on issue #10771346: runtime restart
 2013-09-16 18:47:19 -07:00
Dianne Hackborn
8a7a93e20d Merge "Work on issue #10771346: runtime restart" into klp-dev 2013-09-17 01:43:09 +00:00
Christopher Tate
a8de43fd8c Don't assume that transport unbind == transport invalid 
We now expect that the transport service's host process will be
OOM-killed sometimes, but will come back automatically because we
still hold the binding.  So, we no longer drop it as the
expected-to-be-current transport when that happens.

Bug 10728767

Change-Id: I5e756e8942e7c4c3567632f10460ee31b9618d75
 2013-09-16 18:14:52 -07:00
Jean-Michel Trivi
c3c0b9921f Public API for LoudnessEnhancer audio effect 
Follows the API style of the other audio effects

Bug 8413913

Change-Id: I1ee21b0af7d9fc565d9cdacd006684577eeb7b21
 2013-09-16 18:07:02 -07:00
Christopher Tate
cf611b776e am 60fcce6c: Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev 
* commit '60fcce6cb1bbe720634ae5e3d94aeae5e4c1e53e':
  Introduce maxSdkVersion for <uses-permission>
 2013-09-16 18:06:27 -07:00
Christopher Tate
60fcce6cb1 Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev 2013-09-17 01:01:47 +00:00