OSDN Git Service
Marco Nelissen [Thu, 3 Oct 2013 21:29:18 +0000 (14:29 -0700)]
Update fake powermanager to new interface
Change-Id: I6f14498d7002b4720293a1c77f4fbb66869c36fb
Jim Miller [Tue, 1 Oct 2013 22:43:16 +0000 (15:43 -0700)]
resolved conflicts for merge of
fb2e3c8d to master
Change-Id: I159b529adae04a33a965ec0d43fc9a47e82b6417
Adam Lesinski [Tue, 1 Oct 2013 00:16:09 +0000 (17:16 -0700)]
resolved conflicts for merge of
0c923b7c to master
Change-Id: I4f314b48c7714706329509d931d2c53079f5e248
Adam Lesinski [Mon, 30 Sep 2013 23:23:15 +0000 (16:23 -0700)]
resolved conflicts for merge of
5223a5ff to master
Change-Id: I6523e4b7df88f21fbe0ecd3ab8f493e5a9867305
Deepanshu Gupta [Tue, 10 Sep 2013 23:38:39 +0000 (16:38 -0700)]
Fix ClassCastException when rendering ListView
Bug: b.android.com/59300
Change-Id: I1e73910cf42de1b02f11cc77f575af9492320a19
Kenny Root [Thu, 12 Sep 2013 05:38:32 +0000 (22:38 -0700)]
Add new getOpPackageName for BridgeContext
Change-Id: Ib39b0bd2d1eb794ae4565e54251e4355fa139a14
Jonathan Dixon [Thu, 12 Sep 2013 00:34:37 +0000 (17:34 -0700)]
Merge 'Preparation for deleting WebViewClassic'
Originally from I4d6773a88ea2932982278127a3c96d38be54ddf5
- file has move to a different git project in master, so manually
re-applied the diff that landed in klp-dev
Change-Id: I813210bd6160ab71c7a4dff9c221db31d8cc305c
Deepanshu Gupta [Mon, 9 Sep 2013 19:32:19 +0000 (12:32 -0700)]
Add isPremultiplied option to Bitmap_Delegate in LayoutLib
Change-Id: I2398af48913682ec698389b695aa256204c8aa47
Narayan Kamath [Mon, 9 Sep 2013 09:32:38 +0000 (10:32 +0100)]
Fix build, fallout from change
451f6b981a2cd
Change-Id: Id85d06221eccbda786721a05f3f6d9d94c1cbb74
Michael Wright [Fri, 6 Sep 2013 23:50:52 +0000 (16:50 -0700)]
Add support for supports-input element to aapt
Change-Id: Ie8c8c44f126383c351f2ebb9ae7c3694fb0a9b16
John Reck [Thu, 5 Sep 2013 23:26:04 +0000 (16:26 -0700)]
libpng usage tweaks
Bug:
10447005
Call png_set_interlace_handling explicitly instead of relying on
implicit handling that logs warnings
Include filename when printing warnings
Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99
Deepanshu Gupta [Thu, 5 Sep 2013 20:49:17 +0000 (13:49 -0700)]
Fix text rendering
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.
Change-Id: Ib7b008b4ab5e689038678825289199aeb4bd815b
Deepanshu Gupta [Thu, 5 Sep 2013 20:25:20 +0000 (13:25 -0700)]
Fix layout rendering for RTL locales
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.
Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.
Change-Id: Icbb57ee2ac7c6d8dfc34c2f04dce34d820b9b1ed
Chet Haase [Thu, 5 Sep 2013 00:41:11 +0000 (17:41 -0700)]
Remove scenes from Resource.cpp
Part of the Transition API changes, except that the tools/ directory
got moved between klp and master, so re-making the same changes here.
Issue #
10460684 KLP API Review: android.view.transition and android.animation
Change-Id: Icedca1dc689285b4b213f9376656b26f18c7f23e
Adam Lesinski [Fri, 24 Jan 2014 02:17:42 +0000 (18:17 -0800)]
Revert "Move frameworks/base/tools/ to frameworks/tools/"
This reverts commit
9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
Narayan Kamath [Mon, 27 Jan 2014 14:21:38 +0000 (14:21 +0000)]
Revert "AArch64: Make graphics classes 64-bit compatible"
This reverts commit
18b4cbeedef21c1fa666a110a157bab66edff976.
Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
Narayan Kamath [Mon, 27 Jan 2014 14:21:22 +0000 (14:21 +0000)]
Revert "Follow up for change
18b4cbeedef21c1fa666a110a157b."
This reverts commit
c5b281c981d7290e3615d105cf2e23afc32c304d.
Change-Id: Id36f463e73068e14bc8fac0a289180be078ffbf9
Narayan Kamath [Mon, 27 Jan 2014 13:36:57 +0000 (13:36 +0000)]
Follow up for change
18b4cbeedef21c1fa666a110a157b.
Fix a few functions that were not converted correctly.
Change-Id: Ieb6bd9ea90af595080f1248a1d5892c460228290
Ashok Bhat [Mon, 20 Jan 2014 20:08:01 +0000 (20:08 +0000)]
AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:
ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com
Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.
Commit messages below:
================================================
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers as they can
be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
==================================================================
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
===================================================================
Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
Narayan Kamath [Mon, 27 Jan 2014 12:12:07 +0000 (12:12 +0000)]
resolved conflicts for merge of
1cd2834f to master
Narayan Kamath [Mon, 27 Jan 2014 12:07:15 +0000 (12:07 +0000)]
am
30e20ac5: am
ebd43d46: am
dff83e2b: am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
30e20ac528731a778eec45506d1e57c8839b318a':
AssetManager cookies should be int32_t and not void*.
Narayan Kamath [Mon, 27 Jan 2014 12:04:30 +0000 (12:04 +0000)]
am
ebd43d46: am
dff83e2b: am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
ebd43d46ebf53005ae60af59948f8ed634f9bafb':
AssetManager cookies should be int32_t and not void*.
Narayan Kamath [Mon, 27 Jan 2014 12:01:15 +0000 (04:01 -0800)]
am
dff83e2b: am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
dff83e2b121b356a264e908f8a7d64584eab9b73':
AssetManager cookies should be int32_t and not void*.
Narayan Kamath [Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)]
am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
d5970e9ca34038051f694c7349fa5f3548ee9499':
AssetManager cookies should be int32_t and not void*.
Narayan Kamath [Mon, 27 Jan 2014 11:56:03 +0000 (11:56 +0000)]
Merge "AssetManager cookies should be int32_t and not void*."
Narayan Kamath [Mon, 27 Jan 2014 11:17:22 +0000 (11:17 +0000)]
AssetManager cookies should be int32_t and not void*.
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.
(cherry picked from commit
ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit
a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit
a9d5701b034ed2d9771b3f0943e1add00741d7cd)
Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
Narayan Kamath [Fri, 24 Jan 2014 14:06:08 +0000 (14:06 +0000)]
AssetManager cookies are now int32_t, not void*.
This makes cookies on both the java & native side
4 byte signed integral values.
Change-Id: I6843d6c5ba7ff42dc454f20240844a158ae8e818
Wink Saville [Sun, 26 Jan 2014 16:58:24 +0000 (16:58 +0000)]
am
dafb2420: am
d4b688cf: am
d165f365: am
5d2d911a: am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
dafb2420a34a5b39aca6ddf993e86778edd76b5d':
Telephony: Modify code to check that PUK code length is always 8.
Wink Saville [Sun, 26 Jan 2014 16:55:49 +0000 (16:55 +0000)]
am
d4b688cf: am
d165f365: am
5d2d911a: am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
d4b688cf97736eb4c543149686ab851b9ea21161':
Telephony: Modify code to check that PUK code length is always 8.
Wink Saville [Sun, 26 Jan 2014 16:52:26 +0000 (16:52 +0000)]
am
d165f365: am
5d2d911a: am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
d165f365b394b7632d8a0cfbc14bbf4004858333':
Telephony: Modify code to check that PUK code length is always 8.
Wink Saville [Sun, 26 Jan 2014 16:49:09 +0000 (08:49 -0800)]
am
5d2d911a: am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
Telephony: Modify code to check that PUK code length is always 8.
Wink Saville [Sun, 26 Jan 2014 16:43:28 +0000 (08:43 -0800)]
am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
d1eeb6747820f549ec724546a84e3860b4580587':
Telephony: Modify code to check that PUK code length is always 8.
Wink Saville [Sat, 25 Jan 2014 21:51:34 +0000 (21:51 +0000)]
Merge "Telephony: Modify code to check that PUK code length is always 8."
Craig Mautner [Sat, 25 Jan 2014 01:30:58 +0000 (01:30 +0000)]
am
38eda9c4: Remove unnecessary logging.
* commit '
38eda9c42bf327f6f521c766ea716305e5f71c05':
Remove unnecessary logging.
Craig Mautner [Sat, 25 Jan 2014 01:26:52 +0000 (17:26 -0800)]
Remove unnecessary logging.
Fixes bug
12593710.
Change-Id: I55c33bb4d6c9e17e810be7cc033e01fb9d2d6cf7
Dianne Hackborn [Fri, 24 Jan 2014 23:30:51 +0000 (23:30 +0000)]
Merge "Add app version codes to procstats."
Chris Craik [Fri, 24 Jan 2014 21:22:35 +0000 (13:22 -0800)]
Clear root level reorder lists to prevent accessing stale DisplayLists
bug:
12581401
Adds temporary logging which should log/crash earlier on incorrectly
reordering hierarchies.
Change-Id: Iee00940718c3cc868161e754aff93cd3b2747094
Narayan Kamath [Fri, 24 Jan 2014 14:59:06 +0000 (14:59 +0000)]
Merge "Hide android.os.Parcel.obtain(int)."
Narayan Kamath [Fri, 24 Jan 2014 09:52:55 +0000 (09:52 +0000)]
am
5d094b94: am
aa43eb51: am
7866f2fc: am
8005b9af: am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
5d094b947b328d2631a0203c1527b0c7c20ce219':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:48:36 +0000 (09:48 +0000)]
am
aa43eb51: am
7866f2fc: am
8005b9af: am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:45:13 +0000 (09:45 +0000)]
am
7866f2fc: am
8005b9af: am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
7866f2fcfa753154a492bfb3fb21061f6fcce709':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:42:08 +0000 (01:42 -0800)]
am
8005b9af: am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
8005b9af11ea366672d739769510240f931f3050':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:39:47 +0000 (01:39 -0800)]
am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
3c30eff63fb33901df4e040ecce78f7755be588f':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:27:48 +0000 (09:27 +0000)]
Merge "Remove unused field from AssetManager."
Dianne Hackborn [Fri, 24 Jan 2014 01:57:20 +0000 (17:57 -0800)]
Add app version codes to procstats.
Now the per-package proc stats data is also per-app-version-code.
In addition to changing the data structure to have one more
SparseArray and passing a version code all over, this also required
improving how we reset the stats so that we can prune a multi-package
process record back to a single package. Otherwise, as you install
updates to apps, the proc stats data would continue to explode as
the data for each of those app's processes got turned to a
multi-package due to tracking the old and new versions at the
same time.
This also bumps the checkin version code, since the package entries
also include a new field for the app version code.
Change-Id: I80de36addb0a75c7b08aef747c6f6c8012d01ee4
Selim Gurun [Thu, 23 Jan 2014 23:40:34 +0000 (15:40 -0800)]
Merge commit '
2474ebe8' into manualmerge
Selim Gurun [Thu, 23 Jan 2014 23:07:53 +0000 (15:07 -0800)]
Merge commit '
647c5160' into manualmerge
Selim Gurun [Thu, 23 Jan 2014 22:46:56 +0000 (22:46 +0000)]
am
0a33c4f9: am
6735020a: am
d261243c: am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
0a33c4f9f54b59dac4e745e09db05990d53a1aba':
Revert "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 22:42:00 +0000 (22:42 +0000)]
am
6735020a: am
d261243c: am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
6735020adbcc7028185ca536e2b2cb49ec7687fb':
Revert "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 22:39:53 +0000 (14:39 -0800)]
am
d261243c: am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
d261243c146515184cb4caf2284c6764a045443a':
Revert "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 22:37:15 +0000 (14:37 -0800)]
am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
Revert "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 22:26:33 +0000 (22:26 +0000)]
Merge "Revert "Adding freeMemoryForTests static method to WebView.""
Selim Gurun [Thu, 23 Jan 2014 22:13:40 +0000 (22:13 +0000)]
Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit
c6a2a6e20f7ddd5a903e9395f6c574c316960694.
Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
Selim Gurun [Thu, 23 Jan 2014 19:59:19 +0000 (19:59 +0000)]
am
b311739d: am
d9c2e3d3: am
01607523: am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
b311739d6fd2fdc5a3607ad79a1547af8500cfae':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:54:15 +0000 (19:54 +0000)]
am
d9c2e3d3: am
01607523: am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
d9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:51:22 +0000 (11:51 -0800)]
am
01607523: am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
016075239fc28704bb0e2b78a3c5540fde711eea':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:49:00 +0000 (11:49 -0800)]
am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
f6d69ae0f9215e08137b010acb4076a30e3d28c6':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:42:18 +0000 (19:42 +0000)]
Merge "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 19:21:00 +0000 (11:21 -0800)]
Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
Bug: b/
10629847
(cherry picked from commit
54daaf1cffddad6366fac2ccfceb1e042dd8e90e)
Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
Baligh Uddin [Thu, 23 Jan 2014 17:11:15 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 23 Jan 2014 16:04:07 +0000 (08:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie068d31c1845ef03118ea7c45e04f729ec3a12df
Auto-generated-cl: translation import
Baligh Uddin [Thu, 23 Jan 2014 15:56:14 +0000 (07:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d41b182178898b84085e67b192b8d2f1c27fcc9
Auto-generated-cl: translation import
Narayan Kamath [Thu, 23 Jan 2014 14:17:11 +0000 (14:17 +0000)]
Hide android.os.Parcel.obtain(int).
This will break on 64 bit because 64 bit pointers are
wider than java int.
Also, this method technically isn't a public API because
it's a protected method on a final class. It shows up in
our api.txt files because of a quirk in the API generation
system.
Change-Id: I2b574943008ed34696b048195c0cac6af1aa0a3b
Narayan Kamath [Thu, 23 Jan 2014 09:39:42 +0000 (09:39 +0000)]
Merge "Java7 Locale & Script related changes."
Christopher Tate [Thu, 23 Jan 2014 03:02:04 +0000 (19:02 -0800)]
resolved conflicts for merge of
a5bb65aa to master
Change-Id: Ib286d5194f68c55cfd2e5c17a5eb89ea32add574
Christopher Tate [Thu, 23 Jan 2014 01:56:39 +0000 (01:56 +0000)]
am
f2c67e24: am
8bc01824: am
094efb3f: am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
f2c67e24e460e0d887bdd5167fccac9d5c54f34a':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:50:10 +0000 (01:50 +0000)]
am
8bc01824: am
094efb3f: am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
8bc01824b999f097aa211c9de9e4dff6a0497432':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:47:04 +0000 (17:47 -0800)]
am
094efb3f: am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
094efb3f5350b3ce95dcc790bc237c5caa901a20':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:43:52 +0000 (17:43 -0800)]
am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
407f74f494e5374d9bdceae9d9fb453aa8270f6b':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:40:37 +0000 (01:40 +0000)]
Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
Dirk Dougherty [Thu, 23 Jan 2014 00:47:09 +0000 (00:47 +0000)]
am
6cc8c56a: am
830b3df3: am
6bc2bb15: am
9971cbe9: am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
6cc8c56a14f509e6e37b175e4255225da411d317':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:43:10 +0000 (00:43 +0000)]
am
830b3df3: am
6bc2bb15: am
9971cbe9: am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
830b3df3fa226a961deb35bd39cb49eb6eccbf56':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:40:07 +0000 (00:40 +0000)]
am
6bc2bb15: am
9971cbe9: am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
6bc2bb15fe25a4378a759d697de12de0c8d8725f':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:36:34 +0000 (16:36 -0800)]
am
9971cbe9: am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
9971cbe92284e589d6540cbf22f17c816692bb62':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:33:06 +0000 (00:33 +0000)]
am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
94ac4f6855d84c6d40006002f43ad1f1a0447954':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Wed, 27 Nov 2013 18:34:47 +0000 (10:34 -0800)]
Add samples TOC generated from browsable sources.
(cherry picked from commit
1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d)
Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda
Christopher Tate [Thu, 23 Jan 2014 00:05:29 +0000 (00:05 +0000)]
am
222496f8: am
5d734dbc: am
e1d18f6e: am
0e3df216: am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
222496f82fb78473a876da5dc395714b0fa5b99c':
Only send storage intents after boot complete
Christopher Tate [Thu, 23 Jan 2014 00:01:01 +0000 (00:01 +0000)]
am
5d734dbc: am
e1d18f6e: am
0e3df216: am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
5d734dbc56cd2d4350f4a35f1bedbb6b40247e5c':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:57:47 +0000 (23:57 +0000)]
am
e1d18f6e: am
0e3df216: am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
e1d18f6eb0e46b7a71ce7cf9ddb1c60dd7ad054f':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:53:58 +0000 (15:53 -0800)]
am
0e3df216: am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
0e3df21642122ae8a43be1a35723782bdd417b7a':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:50:31 +0000 (15:50 -0800)]
am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
cc81bcece411794b4eac6b03b7700a0214fdbb87':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:46:57 +0000 (23:46 +0000)]
Merge "Only send storage intents after boot complete"
Marco Nelissen [Wed, 22 Jan 2014 23:12:32 +0000 (23:12 +0000)]
Merge "Check that the exif bits are actually there"
Marco Nelissen [Wed, 22 Jan 2014 23:10:57 +0000 (15:10 -0800)]
Check that the exif bits are actually there
b/
12663599
Change-Id: If2af0ab20f29ab3264a8c6c8c4abf0ebeff6616c
Dianne Hackborn [Wed, 22 Jan 2014 22:18:13 +0000 (22:18 +0000)]
Merge "Battery stats improvements."
Dianne Hackborn [Wed, 22 Jan 2014 21:39:16 +0000 (13:39 -0800)]
Battery stats improvements.
- Adjust total power use when there is unaccounted power so that our
percentages don't end up > 100%.
- Fix accounting of isolated uids to be against the owning real app
uids.
- Rework how we put cpu use into the battery stats to no longer need
this uid name cache that can confuse the uid it is associated with.
- Finish implementing events in the history, adding a string pool and
reading/writing/dumping them.
- Add first two events: processes starting and finishing.
- Fix alarm manager reporting of wakeup alarms to be adjusted by the
WorkSource associated with the alarm, so they are blamed on the
correct app.
- New "--history" dump option allows you to perform a checkin of
only the history data.
- Fixed BitDescription bug that would cause incorrect printing of
changes in some states.
Change-Id: Ifbdd0740132ed178033851c58f165adc0d50f716
Narayan Kamath [Wed, 22 Jan 2014 11:09:09 +0000 (11:09 +0000)]
Remove unused field from AssetManager.
This field was introduced in commit
4bdd33b81a17 but wasn't
used there (or since).
Change-Id: I0615e98b8990d42da6b85f8094ab19eb0465fd9e
quddusc [Wed, 22 Jan 2014 05:56:16 +0000 (05:56 +0000)]
am
ddef0ec9: am
fbb2a975: am
c99557c9: am
0cb965a6: am
5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
* commit '
ddef0ec94b01b18f4452dea7ed98a4ff5184e49b':
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
quddusc [Wed, 22 Jan 2014 05:50:56 +0000 (05:50 +0000)]
am
fbb2a975: am
c99557c9: am
0cb965a6: am
5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
* commit '
fbb2a9753176af340d18fa6b72a1e0e46c7c3c6f':
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
quddusc [Wed, 22 Jan 2014 05:46:32 +0000 (05:46 +0000)]
am
c99557c9: am
0cb965a6: am
5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
* commit '
c99557c92c9bebc089c4eb7bf37a63dca8f28a6a':
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
quddusc [Wed, 22 Jan 2014 04:13:48 +0000 (20:13 -0800)]
am
0cb965a6: am
5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
* commit '
0cb965a69aac9c2a83798960a0efeaa6e596e445':
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
quddusc [Wed, 22 Jan 2014 04:10:13 +0000 (04:10 +0000)]
am
5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
* commit '
5020a8736f3319d295d31bed421f837788878451':
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
quddusc [Wed, 22 Jan 2014 04:07:17 +0000 (04:07 +0000)]
Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs
quddusc [Mon, 1 Jul 2013 23:57:26 +0000 (16:57 -0700)]
cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705
Scott Main [Wed, 22 Jan 2014 02:03:05 +0000 (02:03 +0000)]
Scott Main [Wed, 22 Jan 2014 02:00:08 +0000 (02:00 +0000)]
Christopher Tate [Wed, 22 Jan 2014 01:58:58 +0000 (01:58 +0000)]
am
46c95dfc: am
b450505c: am
a7a9327b: am
5474f085: am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
46c95dfc1009607184ea023921e1f262f38cd61e':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Scott Main [Wed, 22 Jan 2014 01:55:31 +0000 (01:55 +0000)]
Christopher Tate [Wed, 22 Jan 2014 01:55:07 +0000 (01:55 +0000)]
am
b450505c: am
a7a9327b: am
5474f085: am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
b450505c2e0d0dfd67bc228961a00a6eaaf092df':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Scott Main [Wed, 22 Jan 2014 01:52:05 +0000 (17:52 -0800)]