OSDN Git Service
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 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
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)]
Christopher Tate [Wed, 22 Jan 2014 01:51:34 +0000 (01:51 +0000)]
am
a7a9327b: am
5474f085: am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
a7a9327be8b2b2ee2a461d1a0558c0c7b5b9271c':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Scott Main [Wed, 22 Jan 2014 01:49:36 +0000 (01:49 +0000)]
Christopher Tate [Wed, 22 Jan 2014 01:48:35 +0000 (17:48 -0800)]
am
5474f085: am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
5474f085b05b527f7e1dc7c6f536736c2f043fb0':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Christopher Tate [Wed, 22 Jan 2014 01:45:00 +0000 (17:45 -0800)]
am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
9fc157a4767f54d1cff53dc9489638b67aec2da3':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Christopher Tate [Wed, 22 Jan 2014 01:42:50 +0000 (01:42 +0000)]
Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
Andy Hung [Tue, 21 Jan 2014 23:03:33 +0000 (23:03 +0000)]
Merge "Add "throws IOException" to MediaCodec factory methods"
Adam Powell [Tue, 21 Jan 2014 18:41:24 +0000 (18:41 +0000)]
Merge "Revert "Update smoothScrollToPosition to move faster for large offsets""
Adam Powell [Tue, 21 Jan 2014 18:39:53 +0000 (18:39 +0000)]
Revert "Update smoothScrollToPosition to move faster for large offsets"
This reverts commit
203af24e4c2975c0b95fb4cc85ea03865e3b0e5b.
Change-Id: Ic56a9ded03eec188fb2834b42b60171f3cacb58b
Scott Main [Tue, 21 Jan 2014 18:12:07 +0000 (10:12 -0800)]
fix code typo
Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
Naofumi Harada [Tue, 21 Jan 2014 01:29:36 +0000 (10:29 +0900)]
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.
Bug:
12640283
Change-Id: Ic24b5882f65dabdfae9cc39da3d68661bed4fc31
Narayan Kamath [Mon, 20 Jan 2014 10:32:54 +0000 (10:32 +0000)]
Java7 Locale & Script related changes.
The foundation for supporting ISO-639-3 languages.
Change-Id: I1327ee4f2c334acfd67dbc532680e1d721e09ac1
Narayan Kamath [Thu, 16 Jan 2014 19:00:32 +0000 (19:00 +0000)]
Hide AssetInputStream.getAssetInt (Take 2)
This reverts commit
b1bd1fe7fd9ed6b6e4518713ef5f5716a84d97e8.
Johan Redestig [Sat, 18 Jan 2014 21:46:56 +0000 (22:46 +0100)]
Only send storage intents after boot complete
It is not possible to send a broadcast before the system
boot is completed. If you do it anyway you will get an
IllegalStateException: Cannot broadcast before boot completed.
If a memory card is inserted or removed while the phone is
booting up, there is a risk that the MountService will try to
broadcast a storage intent too early, and cause the device
to crash.
Use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to avoid
problems with too early broadcasts.
Change-Id: Ied36a13d235df37c9788e45a35de40d919ae0cd0
Elliott Hughes [Sat, 18 Jan 2014 02:47:20 +0000 (02:47 +0000)]
am
a850e5ac: am
8815d261: am
8da106eb: am
aa80f1a3: am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44':
Don't confuse stat and stat64.
Igor Murashkin [Sat, 18 Jan 2014 02:45:54 +0000 (02:45 +0000)]
Merge "camera2: Add android.request.partialResultCount"
Elliott Hughes [Sat, 18 Jan 2014 02:44:06 +0000 (02:44 +0000)]
am
8815d261: am
8da106eb: am
aa80f1a3: am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
8815d261d9fefbac8f24936dc37a055ab9ced038':
Don't confuse stat and stat64.
Elliott Hughes [Sat, 18 Jan 2014 02:42:01 +0000 (02:42 +0000)]
am
8da106eb: am
aa80f1a3: am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
Don't confuse stat and stat64.
Elliott Hughes [Sat, 18 Jan 2014 02:38:17 +0000 (18:38 -0800)]
am
aa80f1a3: am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
aa80f1a3caf6271f1c48a779e260811f2802a9f0':
Don't confuse stat and stat64.
Igor Murashkin [Sat, 18 Jan 2014 02:30:59 +0000 (18:30 -0800)]
camera2: Add android.request.partialResultCount
Change-Id: Ie21010767ad1e58b3a46e977e7f9ee7f1951bad2
Elliott Hughes [Sat, 18 Jan 2014 02:36:02 +0000 (18:36 -0800)]
am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
c9a60b0f77525244ac4f970258703b8dc62ee140':
Don't confuse stat and stat64.
Elliott Hughes [Sat, 18 Jan 2014 02:32:39 +0000 (02:32 +0000)]
Merge "Don't confuse stat and stat64."
Ruben Brunk [Sat, 18 Jan 2014 02:31:19 +0000 (02:31 +0000)]
Merge "camera3: Update optical stabilization tags."
Ruben Brunk [Sat, 18 Jan 2014 02:30:23 +0000 (18:30 -0800)]
camera3: Update optical stabilization tags.
Change-Id: Ic2bdec216c1685f2ea3036f9d027ea24679a8bfe
Igor Murashkin [Sat, 18 Jan 2014 02:28:16 +0000 (02:28 +0000)]
Merge "camera2: Add synchronization definitions to enable LIMITED HAL3 devices"
Igor Murashkin [Sat, 18 Jan 2014 02:18:39 +0000 (18:18 -0800)]
camera2: Add synchronization definitions to enable LIMITED HAL3 devices
Change-Id: Ic5fda4bdc3dda0d21f4738c81b5742f86e4ef02c
Elliott Hughes [Sat, 18 Jan 2014 02:27:27 +0000 (18:27 -0800)]
Don't confuse stat and stat64.
Bug:
11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
Igor Murashkin [Sat, 18 Jan 2014 02:15:25 +0000 (02:15 +0000)]
Merge "camera2: Add test patterns and pipeline depth information"
Igor Murashkin [Sat, 18 Jan 2014 02:06:02 +0000 (18:06 -0800)]
camera2: Add test patterns and pipeline depth information
Bug:
9625427
Change-Id: I11ff3a74f3a115ac9b699ce516400ed323c274f9
Jeff Brown [Sat, 18 Jan 2014 01:53:32 +0000 (01:53 +0000)]
am
e2c9cd58: Merge "Refactor display manager service to new pattern." into klp-modular-dev
* commit '
e2c9cd583f4f706b48270b8cbe84df627c69af24':
Refactor display manager service to new pattern.
Jeff Brown [Sat, 18 Jan 2014 01:44:07 +0000 (01:44 +0000)]
Merge "Refactor display manager service to new pattern." into klp-modular-dev
Ruben Brunk [Sat, 18 Jan 2014 01:43:57 +0000 (01:43 +0000)]
Merge "camera3: Update sceneMode tag spec."
Ruben Brunk [Sat, 18 Jan 2014 01:05:54 +0000 (17:05 -0800)]
camera3: Update sceneMode tag spec.
Change-Id: I495435397086a295280c556d94fe8efd442a12c3
Igor Murashkin [Sat, 18 Jan 2014 01:24:11 +0000 (17:24 -0800)]
camera_metadata: Update android.tonemap.* definitions
Change-Id: Icdabd02d892018b104955146a4d94b5042ea59d8
Zhijun He [Sat, 18 Jan 2014 00:46:08 +0000 (00:46 +0000)]
Merge "Camera2: Update shading mode spec"
Ruben Brunk [Sat, 18 Jan 2014 00:44:46 +0000 (00:44 +0000)]
Merge "camera3: Update availableEffects, effectMode tags in frameworks/base."
Zhijun He [Sat, 18 Jan 2014 00:43:05 +0000 (16:43 -0800)]
Camera2: Update shading mode spec
Change-Id: Id4dc8de6e66aa130677ecab700a982943fcd8e09
Ruben Brunk [Sat, 18 Jan 2014 00:42:51 +0000 (16:42 -0800)]
camera3: Update availableEffects, effectMode tags in frameworks/base.
Change-Id: I1edc89f7af9ef15894cfd398116730afa6b0053c
Alan Viverette [Fri, 17 Jan 2014 23:45:19 +0000 (23:45 +0000)]
Merge "Prevent RevealDrawable from drawing mask when layer is empty"
Alan Viverette [Fri, 17 Jan 2014 23:38:20 +0000 (15:38 -0800)]
Prevent RevealDrawable from drawing mask when layer is empty
Compositing the mask layer into an empty layer using SRC_IN will
actually composite into the layer UNDER the empty layer.
Change-Id: I5ba434b0d7e6a5bc707fe842a5db82ae33066912
Ruben Brunk [Fri, 17 Jan 2014 23:35:20 +0000 (23:35 +0000)]
Merge "camera3: Update availableSceneModes tag spec in frameworks/base."
Ruben Brunk [Fri, 17 Jan 2014 23:33:02 +0000 (15:33 -0800)]
camera3: Update availableSceneModes tag spec in frameworks/base.
Change-Id: Ic12f131e438d1370c9db0027a4c54a540a5cb78f
Ruben Brunk [Fri, 17 Jan 2014 23:24:00 +0000 (23:24 +0000)]
Merge "camera3: focalLength tag frameworks/base changes."
Ruben Brunk [Fri, 17 Jan 2014 23:21:13 +0000 (15:21 -0800)]
camera3: focalLength tag frameworks/base changes.
Change-Id: I59614223ae65e602f3461029cb4b8848fb22950e
Igor Murashkin [Fri, 17 Jan 2014 23:20:49 +0000 (23:20 +0000)]
Merge "camera2: Add missing javadoc images"
Igor Murashkin [Fri, 17 Jan 2014 23:19:54 +0000 (15:19 -0800)]
camera2: Add missing javadoc images
Change-Id: Icc662dd63ba0a3e48b5f94dfb65479abcfacd047
Igor Murashkin [Fri, 17 Jan 2014 23:08:38 +0000 (23:08 +0000)]
Merge "camera2: Update spec for android.colorCorrection.* in metadata"
Igor Murashkin [Fri, 17 Jan 2014 23:07:52 +0000 (15:07 -0800)]
camera2: Update spec for android.colorCorrection.* in metadata
Change-Id: I02ba758f3da9e7c9e304591c410ca5385ebf4b4b
OSDN Git Service
