OSDN Git Service
Vinit Deshpande [Thu, 31 Jul 2014 19:54:14 +0000 (19:54 +0000)]
am
daec2eb8: Merge "Rename HotspotListener to BssidListener" into lmp-dev
* commit '
daec2eb80d804aa229d66cfb3cd3672df89502a5':
Rename HotspotListener to BssidListener
ztenghui [Thu, 31 Jul 2014 19:46:06 +0000 (19:46 +0000)]
am
6fb451ae: Correct the tag\'s name in the exceptions
* commit '
6fb451ae17ead6dd26dcf2662e0ab73c4184c3ce':
Correct the tag's name in the exceptions
ztenghui [Thu, 31 Jul 2014 18:16:05 +0000 (11:16 -0700)]
Correct the tag's name in the exceptions
Change-Id: I9d1499fbcf8adb6bf0c5c0b7a10a8b480a708c09
Joe Fernandez [Thu, 31 Jul 2014 18:50:44 +0000 (18:50 +0000)]
am
5973c2c5: am
441e7aa2: am
eb4bc851: am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
5973c2c56e378ee4a0e7177ff797f72c4680de3c':
docs: Adding TIF one-pager to TV docs in L-Preview
Joe Fernandez [Thu, 31 Jul 2014 18:43:21 +0000 (18:43 +0000)]
am
441e7aa2: am
eb4bc851: am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
441e7aa23478b8de386efc69d43f889979bc6eee':
docs: Adding TIF one-pager to TV docs in L-Preview
Joe Fernandez [Thu, 31 Jul 2014 18:40:05 +0000 (18:40 +0000)]
am
eb4bc851: am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
eb4bc851aade1090c0a4e1f1e6f7ecd136b4a47a':
docs: Adding TIF one-pager to TV docs in L-Preview
Joe Fernandez [Thu, 31 Jul 2014 18:35:02 +0000 (18:35 +0000)]
am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
69ed58aced0e884d7758d84067134b04fbcee9c0':
docs: Adding TIF one-pager to TV docs in L-Preview
Wonsik Kim [Thu, 31 Jul 2014 18:27:44 +0000 (18:27 +0000)]
am
cb92d507: Fix NPE when fused geofence hardware is not available.
* commit '
cb92d507167fcce059c4ae91dc46b496f49b4fa3':
Fix NPE when fused geofence hardware is not available.
Wonsik Kim [Thu, 31 Jul 2014 08:50:45 +0000 (17:50 +0900)]
Fix NPE when fused geofence hardware is not available.
b/
16690237
Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
Eunae Kim [Thu, 31 Jul 2014 17:33:41 +0000 (17:33 +0000)]
am
218a0666: Fix a bug that the RecentTask list of other’s may show up to non-primary users.
* commit '
218a0666a5235bc76f2950684bbfcb500e89972c':
Fix a bug that the RecentTask list of other’s may show up to non-primary users.
Eunae Kim [Fri, 25 Jul 2014 00:16:13 +0000 (09:16 +0900)]
Fix a bug that the RecentTask list of other’s may show up to non-primary users.
Cherry-pick from aosp to lmp-dev.
When switching to a newly created user, the user may face this bug
when he opens the RecentTask screen.
A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old
information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information
in mRecentTasks when removing existing user.
Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>
Conflicts:
services/java/com/android/server/am/ActivityManagerService.java
riddle_hsu [Thu, 31 Jul 2014 17:26:08 +0000 (17:26 +0000)]
am
d66d006f: [ActivityManager] Prevent coredump file may not complete for testing.
* commit '
d66d006f9f64a0c9e70827b27e21210192f9b552':
[ActivityManager] Prevent coredump file may not complete for testing.
Raph Levien [Thu, 31 Jul 2014 17:26:04 +0000 (17:26 +0000)]
am
6d624fe2: Merge "Re-remove AndroidEmoji.ttf." into lmp-dev
* commit '
6d624fe23709f4e5d8643a4a9324cb327e142ee1':
Re-remove AndroidEmoji.ttf.
George Mount [Thu, 31 Jul 2014 17:25:59 +0000 (17:25 +0000)]
am
4b71e7f7: Merge "Fix visibility propagation check." into lmp-dev
* commit '
4b71e7f7b03844126df844015004f00e8f19afe9':
Fix visibility propagation check.
riddle_hsu [Thu, 31 Jul 2014 17:25:54 +0000 (17:25 +0000)]
am
5b94ec47: [ActivityManager] Avoid mistaking visibility by finishing task.
* commit '
5b94ec47e84d5e1d116fc281e81d9164f496a388':
[ActivityManager] Avoid mistaking visibility by finishing task.
riddle_hsu [Wed, 30 Jul 2014 16:15:05 +0000 (00:15 +0800)]
[ActivityManager] Prevent coredump file may not complete for testing.
Cherry-pick from aosp to lmp-dev
Sympton:
During testing, skip kill native crash process manually because it
will continue to die by default.
Root Cause:
Large process may take some time to do coredump.In auto test, crash
process will be killed immediately that results incomplete coredump
file.
Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.
Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494
Conflicts:
services/java/com/android/server/am/ActivityManagerService.java
riddle_hsu [Wed, 30 Jul 2014 16:26:51 +0000 (00:26 +0800)]
[ActivityManager] Avoid mistaking visibility by finishing task.
Cherry-picked from aosp into lmp-dev.
Sympton:
Next activity only adds to history but does not launch/resume then results ANR.
Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.
Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
// If starting in an existing task, find where that is...
boolean startIt = true;
for (int i = NH-1; i >= 0; i--) {
ActivityRecord p = mHistory.get(i);
if (p.finishing) { // <--
continue;
}
Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee
Conflicts:
services/java/com/android/server/am/ActivityStack.java
destradaa [Thu, 31 Jul 2014 17:05:00 +0000 (17:05 +0000)]
am
7efb7d49: Fix crash in Volantis because there is not FLP support.
* commit '
7efb7d491c973d3605ab61996ee83b502d9ee765':
Fix crash in Volantis because there is not FLP support.
Roozbeh Pournader [Thu, 31 Jul 2014 17:04:50 +0000 (17:04 +0000)]
am
cac26f40: Crunch Roboto and fix its digits to have the same width.
* commit '
cac26f40512f7548ed3ff75fa37ea6aa837cd545':
Crunch Roboto and fix its digits to have the same width.
destradaa [Thu, 31 Jul 2014 01:17:21 +0000 (18:17 -0700)]
Fix crash in Volantis because there is not FLP support.
b/
16690237
Change-Id: Ie2dd159ad4e9b5cf4b3e2e66023b456927f18130
Roozbeh Pournader [Fri, 25 Jul 2014 02:07:12 +0000 (19:07 -0700)]
Crunch Roboto and fix its digits to have the same width.
Update to upstream version 2.001045, which adds fontcrunch to the font
production process and fixes a problem with uneven digit widths. Should fix
https://code.google.com/p/android-developer-preview/issues/detail?id=330.
The font footprint is reduced by 705KB, most of it due to the crunching, but
also by using a newer version of fonttools that removes extra unnecessary
paddings from the glyf table.
Bug:
15348046
Bug:
16296048
Bug:
16299966
Change-Id: I838711916f8c47db011cfe889b232e60e6f1aa0c
(cherry picked from commit
6feb729b686b902be2520a91281e1a000c055da2)
Mike Lockwood [Thu, 31 Jul 2014 16:54:49 +0000 (16:54 +0000)]
am
72dff5d5: Add toString() methods to some audio classes to help with debugging.
* commit '
72dff5d5264643305108b17b5e76ba3324f5e32b':
Add toString() methods to some audio classes to help with debugging.
Mike Lockwood [Tue, 29 Jul 2014 22:04:03 +0000 (15:04 -0700)]
Add toString() methods to some audio classes to help with debugging.
Change-Id: I2b61d8cdfbcaa7671705771325205b074c50ab1e
Sandeep Siddhartha [Thu, 31 Jul 2014 16:45:32 +0000 (16:45 +0000)]
am
9428457f: Merge "Don\'t unload sound model in start recognition unless the model changes" into lmp-dev
* commit '
9428457f4f1a902a1908f7a9f9ed718f92435a4f':
Don't unload sound model in start recognition unless the model changes
Evan Charlton [Thu, 31 Jul 2014 16:16:56 +0000 (16:16 +0000)]
am
0e097002: Fix a small typo in javadocs
* commit '
0e0970022cdf105e073b182cc4e72e54c3f8eecd':
Fix a small typo in javadocs
Evan Charlton [Thu, 31 Jul 2014 16:09:54 +0000 (09:09 -0700)]
Fix a small typo in javadocs
Service#START_FLAG_RETRY has an extra word; remove it.
Change-Id: I4743e2ea474c70fe5d31f1a4ef257f9752f8e823
Alexandra Gherghina [Thu, 31 Jul 2014 15:47:05 +0000 (15:47 +0000)]
am
8b0b1504: Use the appropriate default icon
* commit '
8b0b1504a357ec809eed25c00923e67b4d6dad22':
Use the appropriate default icon
Alexandra Gherghina [Wed, 30 Jul 2014 12:43:39 +0000 (13:43 +0100)]
Use the appropriate default icon
ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.
Bug:
16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
Jorim Jaggi [Thu, 31 Jul 2014 15:28:03 +0000 (15:28 +0000)]
am
b0376562: Fix a few StatusBarHeaderView regressions
* commit '
b03765626443629220dc0fe33398a1785eaaeefe':
Fix a few StatusBarHeaderView regressions
Christoph Studer [Thu, 31 Jul 2014 15:27:58 +0000 (15:27 +0000)]
am
dd63df29: Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev
* commit '
dd63df2961408f35182b9fab98e51eb5f8c26184':
NoMan: Use Notification.isGroupX() methods
Jorim Jaggi [Thu, 31 Jul 2014 15:23:56 +0000 (17:23 +0200)]
Fix a few StatusBarHeaderView regressions
Change-Id: Iae1af96f80caf4978c5a6ec6ef81b83543e9fe0e
Christoph Studer [Thu, 31 Jul 2014 14:55:58 +0000 (14:55 +0000)]
am
daef7cc7: Merge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev
* commit '
daef7cc7cfa0c721f9419b42704b08762fcf01d3':
SysUI: Respect "no notifs on lockscreen" setting
Jorim Jaggi [Thu, 31 Jul 2014 13:53:35 +0000 (13:53 +0000)]
am
d1429923: Implement nice QS expansion transition in Keyguard
* commit '
d142992377e854f327b376726d94bf5789c8317b':
Implement nice QS expansion transition in Keyguard
Jorim Jaggi [Thu, 31 Jul 2014 13:49:30 +0000 (13:49 +0000)]
am
decb0b1e: Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev
* commit '
decb0b1e788fde607db04e728b9e6dd0e3a9fb66':
Factor out keyguard components of StatusBarHeaderView
Jorim Jaggi [Wed, 30 Jul 2014 15:26:55 +0000 (17:26 +0200)]
Implement nice QS expansion transition in Keyguard
Bug:
16010455
Bug:
15192264
Change-Id: I764652e73ea8e87ad12b9241e038bff843a0a221
Christoph Studer [Thu, 31 Jul 2014 13:44:09 +0000 (13:44 +0000)]
am
cab1943e: Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev
* commit '
cab1943ecd5e6360045112e330778223e218e006':
NoMan: Filter group children for pre-L listeners
Narayan Kamath [Thu, 31 Jul 2014 13:14:52 +0000 (13:14 +0000)]
am
aa1cf141: Merge "Switch TextUtils over to new ICU API." into lmp-dev
* commit '
aa1cf14150cbd656aa31d862865973ecfae76eff':
Switch TextUtils over to new ICU API.
Lorenzo Colitti [Thu, 31 Jul 2014 13:14:47 +0000 (13:14 +0000)]
am
35474389: Merge "Add logging of Legacy Type info." into lmp-dev
* commit '
354743895d837b18e906b3e9a9f4d58a558057d7':
Add logging of Legacy Type info.
Alexandra Gherghina [Thu, 31 Jul 2014 13:07:06 +0000 (13:07 +0000)]
am
790bcf78: Upload new icons from ux
* commit '
790bcf781e5e09ac12e76267073f41555e95f2c9':
Upload new icons from ux
Sander Alewijnse [Thu, 31 Jul 2014 13:06:57 +0000 (13:06 +0000)]
am
9d032110: Fix deadlock window manager and device policy manager.
* commit '
9d0321100fa16cc702ee9335cd761665d5acdba2':
Fix deadlock window manager and device policy manager.
Jae Seo [Thu, 31 Jul 2014 13:06:47 +0000 (13:06 +0000)]
am
b3e54101: TIF: Make TvTrackInfo methods more explicit.
* commit '
b3e541017acd52ea405e04662834694f6aa30987':
TIF: Make TvTrackInfo methods more explicit.
Deepanshu Gupta [Thu, 31 Jul 2014 13:06:39 +0000 (13:06 +0000)]
am
82bf0cf3: Merge "Fix classpath for AndroidLocale" into lmp-dev
* commit '
82bf0cf3716410eb47a8f3c40c414b1bd1b3a018':
Fix classpath for AndroidLocale
Dan Sandler [Thu, 31 Jul 2014 13:06:34 +0000 (13:06 +0000)]
am
ed3a7e7c: Merge "Fix docs build." into lmp-dev
* commit '
ed3a7e7c9a44d9717f7d1d1c444fbc751d9b3a6f':
Fix docs build.
Wonsik Kim [Thu, 31 Jul 2014 13:06:26 +0000 (13:06 +0000)]
am
4092e720: Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev
* commit '
4092e720029d6e682fadbb031a8d5a96c4ce666c':
TIF: fix TvInputHal bug for multiple devices
Lajos Molnar [Thu, 31 Jul 2014 13:06:13 +0000 (13:06 +0000)]
am
a4ec1c74: MediaCodec: clean up image/buffer caching
* commit '
a4ec1c7446b52fef02eb310929849ba54f22b50f':
MediaCodec: clean up image/buffer caching
Youngsang Cho [Thu, 31 Jul 2014 13:05:55 +0000 (13:05 +0000)]
am
bfd63283: Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev
* commit '
bfd63283929ae02f5846d0d85fe75ade70b4107b':
TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input
Alexandra Gherghina [Thu, 31 Jul 2014 10:25:23 +0000 (11:25 +0100)]
Upload new icons from ux
Change-Id: I47da0780b1a4cce1104ae8fc00fcf01701a6d27a
Sander Alewijnse [Tue, 29 Jul 2014 11:01:38 +0000 (12:01 +0100)]
Fix deadlock window manager and device policy manager.
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.
Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
Jae Seo [Thu, 24 Jul 2014 22:54:23 +0000 (15:54 -0700)]
TIF: Make TvTrackInfo methods more explicit.
This change addresses the following API council feedback:
TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
types); most of the time this Bundle will be null.
Bug:
16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
Lajos Molnar [Thu, 31 Jul 2014 04:08:39 +0000 (21:08 -0700)]
MediaCodec: clean up image/buffer caching
- cachedBuffers will be null in async mode
- track dequeued buffers in a map
- free dequeued buffers & bytebuffers
Bug:
14297827
Bug:
11990118
Change-Id: I9f8255921de25d05bf2c11fdaeda45cc185b9dd7
Lorenzo Colitti [Thu, 31 Jul 2014 03:01:59 +0000 (03:01 +0000)]
am
44551060: Allow using third-party HTTP/... stacks for per-network URLs.
* commit '
44551060ffdc8932fcdd2dded75ac9207db6ae84':
Allow using third-party HTTP/... stacks for per-network URLs.
Lorenzo Colitti [Tue, 29 Jul 2014 13:51:27 +0000 (22:51 +0900)]
Allow using third-party HTTP/... stacks for per-network URLs.
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.
Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
Yuncheol Heo [Thu, 31 Jul 2014 01:36:06 +0000 (01:36 +0000)]
am
63674ed0: Don\'t clear local device when it goes to the standby mode.
* commit '
63674ed0034f44ffdd39c1eba590b8dd26fa6464':
Don't clear local device when it goes to the standby mode.
Yuncheol Heo [Wed, 30 Jul 2014 11:31:06 +0000 (20:31 +0900)]
Don't clear local device when it goes to the standby mode.
Some OEM/SOC will keep passing the received packets until the
application processor goes to the sleep mode actually. so we'll
not clear the local devices to get the received packets and react
like in the standby mode.
Bug:
16661406
Change-Id: I6eb9c21877a29905bb0084256dc6692fe0d07170
Shishir Agrawal [Thu, 31 Jul 2014 01:13:52 +0000 (01:13 +0000)]
am
20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev
* commit '
20832529b27a523738ae46c2da036bcf2bb09011':
Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
Andres Morales [Thu, 31 Jul 2014 01:13:48 +0000 (01:13 +0000)]
am
3df55fc3: NFC Unlock api changes
* commit '
3df55fc32ec023f40a1cb22653d50915e05316c4':
NFC Unlock api changes
Andres Morales [Wed, 23 Jul 2014 19:39:55 +0000 (12:39 -0700)]
NFC Unlock api changes
Bug:
16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
destradaa [Wed, 30 Jul 2014 23:42:50 +0000 (23:42 +0000)]
am
823ac05c: Add support for sources in Geofencing APIs.
* commit '
823ac05cce1c324b8d9c8688b89a439fdfae6600':
Add support for sources in Geofencing APIs.
destradaa [Fri, 25 Jul 2014 22:11:56 +0000 (15:11 -0700)]
Add support for sources in Geofencing APIs.
Support setting the source when adding geofences.
b/
14117199
Surface the source when FLP geofence changes state.
b/
14119200
Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
George Mount [Thu, 31 Jul 2014 17:06:03 +0000 (17:06 +0000)]
Merge "Fix visibility propagation check." into lmp-dev
George Mount [Thu, 31 Jul 2014 16:58:16 +0000 (09:58 -0700)]
Fix visibility propagation check.
Bug
16704963
Change-Id: I2538bac4b4565ac8c6b27407c7679fea55b1092b
Deepanshu Gupta [Thu, 31 Jul 2014 07:07:28 +0000 (07:07 +0000)]
Merge "Fix classpath for AndroidLocale" into lmp-dev
Deepanshu Gupta [Thu, 31 Jul 2014 05:08:48 +0000 (22:08 -0700)]
Fix classpath for AndroidLocale
Change-Id: I9af9ac05ec26f12529d51e566bf38789a2579390
Ruben Brunk [Wed, 30 Jul 2014 23:18:07 +0000 (23:18 +0000)]
am
e95f2a0e: camera2: Implement request templates for LEGACY.
* commit '
e95f2a0ee4f3062ca42dc4fc1c128172df651969':
camera2: Implement request templates for LEGACY.
Ruben Brunk [Wed, 30 Jul 2014 05:37:28 +0000 (22:37 -0700)]
camera2: Implement request templates for LEGACY.
Bug:
15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
Yao Chen [Wed, 30 Jul 2014 22:48:13 +0000 (22:48 +0000)]
am
2705fc25: Adds toString() in MediaBrowserItem
* commit '
2705fc25c7c0c7c9e04fa52a05fff7dcd277a71a':
Adds toString() in MediaBrowserItem
Yao Chen [Wed, 30 Jul 2014 22:35:13 +0000 (15:35 -0700)]
Adds toString() in MediaBrowserItem
Bug:
16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab
Ruben Brunk [Wed, 30 Jul 2014 22:15:04 +0000 (22:15 +0000)]
am
3916e3ba: camera2: Add scene and effect mode for LEGACY.
* commit '
3916e3ba989cae92246c35c02f8230bc2cdc2505':
camera2: Add scene and effect mode for LEGACY.
Ruben Brunk [Thu, 24 Jul 2014 20:33:47 +0000 (13:33 -0700)]
camera2: Add scene and effect mode for LEGACY.
Bug:
15116722
Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
Adam Lesinski [Wed, 30 Jul 2014 21:58:40 +0000 (21:58 +0000)]
am
bb8ac196: Add shared library support to aapt dump
* commit '
bb8ac19684449644bd5218b57c9b14b3de12818e':
Add shared library support to aapt dump
Adam Lesinski [Wed, 30 Jul 2014 18:40:39 +0000 (11:40 -0700)]
Add shared library support to aapt dump
AAPT dump should be able to handle dynamic references
that often come with shared library resources.
Bug:
16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
Behdad Esfahbod [Wed, 30 Jul 2014 21:42:22 +0000 (21:42 +0000)]
am
8bbd753a: Support FontFeatureSettings in Paint
* commit '
8bbd753a20cc3fdcc4e92fb99e807b5a69cae6b2':
Support FontFeatureSettings in Paint
Behdad Esfahbod [Tue, 29 Jul 2014 22:43:03 +0000 (18:43 -0400)]
Support FontFeatureSettings in Paint
New API is hidden.
Bug:
15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
Andres Morales [Wed, 30 Jul 2014 21:34:36 +0000 (21:34 +0000)]
am
bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev
* commit '
bdb800965afbb3a4b94ed5a43ef3662d703ebb31':
Revert "NFC Unlock api changes"
Alan Viverette [Wed, 30 Jul 2014 21:26:24 +0000 (21:26 +0000)]
am
077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
* commit '
077daef9a28827318790f134adae6d8cd56fd1d3':
Update switch assets, fix SearchView asset 9-patch areas
keunyoung [Wed, 30 Jul 2014 21:26:20 +0000 (21:26 +0000)]
am
4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev
* commit '
4d2751c5596b9a8e85635db483ffd91091ccc557':
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
Andres Morales [Wed, 30 Jul 2014 21:21:22 +0000 (21:21 +0000)]
am
9fef5fbc: NFC Unlock api changes
* commit '
9fef5fbcd6d47ef86823b3a2d82d34801f9be335':
NFC Unlock api changes
Joe Fernandez [Wed, 30 Jul 2014 21:21:18 +0000 (21:21 +0000)]
am
2c3b3f53: am
a3e52154: am
ecf76d1c: am
b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
* commit '
2c3b3f53b848c627744b3dd78a4b7aa654e73109':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Alan Lau [Wed, 30 Jul 2014 21:21:14 +0000 (21:21 +0000)]
am
990606f0: am
40274ada: (-s ours) am
b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
* commit '
990606f0fb6b03838f40eb5a5f2fa1fbb9c257d1':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
Alan Lau [Wed, 30 Jul 2014 21:21:10 +0000 (21:21 +0000)]
am
1e438bef: am
839ca0d5: (-s ours) am
06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
* commit '
1e438befc1cc2716f23573c3253cf4b24377ad07':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
Andres Morales [Wed, 23 Jul 2014 19:39:55 +0000 (12:39 -0700)]
NFC Unlock api changes
Bug:
16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
Sean Wan [Wed, 30 Jul 2014 21:16:54 +0000 (21:16 +0000)]
am
b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev
* commit '
b4a0e3efc8dc5b26cbc2476c67b052914a2970bf':
Fixed a NullPointerException in AccountManagerService.
Robert Ly [Wed, 30 Jul 2014 21:16:49 +0000 (21:16 +0000)]
am
a5e5d455: Merge "resolved conflicts for merge of
60e7f541 to lmp-dev" into lmp-dev
* commit '
a5e5d455c6cb605fd289a9147b80adf0a955addb':
docs: Revised page to include info about new Publisher API.
Martijn Coenen [Wed, 30 Jul 2014 21:16:45 +0000 (21:16 +0000)]
am
e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev
* commit '
e5996ff428d5adb5d523878d67db347b1676b3bc':
Make some NFC APIs @systemAPI.
Raph Levien [Wed, 30 Jul 2014 21:16:41 +0000 (21:16 +0000)]
am
c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev
* commit '
c4445abba696f199eca2ad9943b51e84d016d494':
Bump refcount of canvas created for Picture
Joe Fernandez [Wed, 30 Jul 2014 21:14:39 +0000 (21:14 +0000)]
am
a3e52154: am
ecf76d1c: am
b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
* commit '
a3e521540b1143264033ca217d11b90ec20e6c54':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Alan Lau [Wed, 30 Jul 2014 21:14:33 +0000 (21:14 +0000)]
am
40274ada: (-s ours) am
b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
* commit '
40274ada4a8699a18836c369ca26ebb837ca37f2':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
Alan Lau [Wed, 30 Jul 2014 21:14:29 +0000 (21:14 +0000)]
am
839ca0d5: (-s ours) am
06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
* commit '
839ca0d5fa3b22e1e27aa8110d665aa6b6b91e26':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
Jason Monk [Wed, 30 Jul 2014 21:06:20 +0000 (21:06 +0000)]
am
6b21f4e6: Allow System UI access to VPN.
* commit '
6b21f4e67d482cf765aac8c1d9dda38e1541b8ad':
Allow System UI access to VPN.
Jason Monk [Wed, 30 Jul 2014 20:41:52 +0000 (16:41 -0400)]
Allow System UI access to VPN.
Bug:
16153201
Change-Id: I5f5e9e0ed3e4e02d6a6995011356b350758f068d
Raph Levien [Wed, 30 Jul 2014 21:03:18 +0000 (21:03 +0000)]
Merge "Bump refcount of canvas created for Picture" into lmp-dev
Raph Levien [Wed, 30 Jul 2014 20:41:10 +0000 (13:41 -0700)]
Bump refcount of canvas created for Picture
Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.
Bug:
16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8
Christoph Studer [Wed, 30 Jul 2014 20:21:08 +0000 (20:21 +0000)]
am
6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev
* commit '
6b8a27343fec2c72074adde1687d45d43fbb95d9':
SysUI: Display group children when no summary is present
Chong Zhang [Wed, 30 Jul 2014 20:20:59 +0000 (20:20 +0000)]
am
baba0e42: fix for MediaCodecList bitrate range exception
* commit '
baba0e4282e875271b79912135bd6418f58913b1':
fix for MediaCodecList bitrate range exception
Ye Wen [Wed, 30 Jul 2014 20:16:49 +0000 (20:16 +0000)]
am
e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev
* commit '
e13e2eefca4db78cd80cb36bd79074934b1d32b4':
Move archived column from pdu/sms to threads (1/4)
Chong Zhang [Tue, 29 Jul 2014 02:38:29 +0000 (19:38 -0700)]
fix for MediaCodecList bitrate range exception
Bug:
16627391
Change-Id: I8c5ba580d7b875d1e2a0ebbf398cf65dd5c4555f
Julia Reynolds [Wed, 30 Jul 2014 20:08:15 +0000 (20:08 +0000)]
am
72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev
* commit '
72746e415e325a9d54a19f8c82fdbd98b9d3658b':
API council - DISALLOW_APPS_CONTROL -- need better documentation.
Geoff Mendal [Wed, 30 Jul 2014 19:51:14 +0000 (19:51 +0000)]
am
6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6764ce228db63bcb8e2f33ad8acbff878090e434':
Import translations. DO NOT MERGE
Christoph Studer [Wed, 30 Jul 2014 19:36:45 +0000 (19:36 +0000)]
am
572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev
* commit '
572532d089d15057c5e00a1d7fcf926d7555299f':
Strip RemoteViews from Notifications, re-create them in SysUI
Derek Sollenberger [Wed, 30 Jul 2014 19:36:41 +0000 (19:36 +0000)]
am
673af558: Merge "Disable fallback chaining in Skia." into lmp-dev
* commit '
673af5582dda0d0cb8a3667fbadef747d22193f1':
Disable fallback chaining in Skia.