OSDN Git Service

android-x86/frameworks-base.git
9 years agoAllow phone UID to export singleton providers
Amith Yamasani [Tue, 5 Aug 2014 18:15:05 +0000 (11:15 -0700)]
Allow phone UID to export singleton providers

Also add a user variant of replacePreferredActivity for use
by SmsApplication.

Map user restrictions for SMS/MMS to AppOps perms.

Bug: 16681533
Change-Id: I3dfed5fc754e33bb51c6f571851653a7c2770e46

9 years agoFix 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

9 years ago[ActivityManager] Prevent coredump file may not complete for testing.
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

9 years agoMerge "Re-remove AndroidEmoji.ttf." into lmp-dev
Raph Levien [Thu, 31 Jul 2014 17:08:36 +0000 (17:08 +0000)]
Merge "Re-remove AndroidEmoji.ttf." into lmp-dev

9 years agoRe-remove AndroidEmoji.ttf.
Roozbeh Pournader [Thu, 31 Jul 2014 00:18:41 +0000 (17:18 -0700)]
Re-remove AndroidEmoji.ttf.

It was mistakenly re-added in 6feb729b686b902be2520a91281e1a000c055da2.

Change-Id: I99a41ed8e6f1975e9808d8063e594fbb996d4334
(cherry picked from commit a7d8d7bfa75b283588aacae16cce78f6161acce9)

9 years agoCrunch Roboto and fix its digits to have the same width.
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)

9 years agoAdd 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

9 years agoMerge "Fix visibility propagation check." into lmp-dev
George Mount [Thu, 31 Jul 2014 17:06:03 +0000 (17:06 +0000)]
Merge "Fix visibility propagation check." into lmp-dev

9 years ago[ActivityManager] Avoid mistaking visibility by finishing task.
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

9 years agoFix visibility propagation check.
George Mount [Thu, 31 Jul 2014 16:58:16 +0000 (09:58 -0700)]
Fix visibility propagation check.

Bug 16704963

Change-Id: I2538bac4b4565ac8c6b27407c7679fea55b1092b

9 years agoFix crash in Volantis because there is not FLP support.
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

9 years agoMerge "Don't unload sound model in start recognition unless the model changes" into...
Sandeep Siddhartha [Thu, 31 Jul 2014 16:42:50 +0000 (16:42 +0000)]
Merge "Don't unload sound model in start recognition unless the model changes" into lmp-dev

9 years agoDon't unload sound model in start recognition unless the model changes
Sandeep Siddhartha [Wed, 30 Jul 2014 20:40:56 +0000 (13:40 -0700)]
Don't unload sound model in start recognition unless the model changes

This helps in start -> detected -> start again scenarios

Change-Id: I6d8d55e469e0623b9eb07595df8897ad4942aa11

9 years agoFix 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

9 years agoUse 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

9 years agoFix a few StatusBarHeaderView regressions
Jorim Jaggi [Thu, 31 Jul 2014 15:23:56 +0000 (17:23 +0200)]
Fix a few StatusBarHeaderView regressions

Change-Id: Iae1af96f80caf4978c5a6ec6ef81b83543e9fe0e

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Wed, 30 Jul 2014 19:48:41 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Jul 2014 19:36:23 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iac3087ace0ea7c351d1606f37000bfa134249184
Auto-generated-cl: translation import

9 years agoMerge "NoMan: Use Notification.isGroupX() methods" into lmp-dev
Christoph Studer [Thu, 31 Jul 2014 15:23:51 +0000 (15:23 +0000)]
Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev

9 years agoNoMan: Use Notification.isGroupX() methods
Christoph Studer [Thu, 31 Jul 2014 14:55:32 +0000 (16:55 +0200)]
NoMan: Use Notification.isGroupX() methods

Change-Id: I041f449361959440a5be7375e655a31fd14e7862

9 years agoMerge "NoMan: Filter group children for pre-L listeners" into lmp-dev
Christoph Studer [Thu, 31 Jul 2014 13:41:26 +0000 (13:41 +0000)]
Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev

9 years agoNoMan: Filter group children for pre-L listeners
Christoph Studer [Fri, 25 Jul 2014 12:18:17 +0000 (14:18 +0200)]
NoMan: Filter group children for pre-L listeners

Bug: 16189575
Change-Id: I5297b5273ab0aaee599981738eb736a49f21ce53

9 years agoMerge "Switch TextUtils over to new ICU API." into lmp-dev
Narayan Kamath [Thu, 31 Jul 2014 12:49:39 +0000 (12:49 +0000)]
Merge "Switch TextUtils over to new ICU API." into lmp-dev

9 years agoSwitch TextUtils over to new ICU API.
Narayan Kamath [Wed, 30 Jul 2014 15:51:27 +0000 (16:51 +0100)]
Switch TextUtils over to new ICU API.

.. and use Locale.getScript() instead of ICU.getScript.

bug: 15876704

(cherry picked from commit 08b3516984850e04e9bb6feae29d691a7557191c)

Change-Id: Ifac179e0577d66062f32c95372b631bf574dfdf9

9 years agoUpload new icons from ux
Alexandra Gherghina [Thu, 31 Jul 2014 10:25:23 +0000 (11:25 +0100)]
Upload new icons from ux

Change-Id: I47da0780b1a4cce1104ae8fc00fcf01701a6d27a

9 years agoFix deadlock window manager and device policy manager.
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

9 years agoTIF: Make TvTrackInfo methods more explicit.
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

9 years agoMerge "Fix classpath for AndroidLocale" into lmp-dev
Deepanshu Gupta [Thu, 31 Jul 2014 07:07:28 +0000 (07:07 +0000)]
Merge "Fix classpath for AndroidLocale" into lmp-dev

9 years agoFix classpath for AndroidLocale
Deepanshu Gupta [Thu, 31 Jul 2014 05:08:48 +0000 (22:08 -0700)]
Fix classpath for AndroidLocale

Change-Id: I9af9ac05ec26f12529d51e566bf38789a2579390

9 years agoMerge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev
Christoph Studer [Thu, 31 Jul 2014 14:51:13 +0000 (14:51 +0000)]
Merge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev

9 years agoSysUI: Respect "no notifs on lockscreen" setting
Christoph Studer [Thu, 31 Jul 2014 14:42:16 +0000 (16:42 +0200)]
SysUI: Respect "no notifs on lockscreen" setting

Setting the stack scroller to INVISIBLE didn't work. Now we just consider
all notifs as "not visible on lockscreen" instead.

Bug: 16650758
Change-Id: I4259c6ec2f663fc988377b8d5a259d6a0f827178

9 years agoImplement nice QS expansion transition in Keyguard
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

9 years agoMerge "Fix docs build." into lmp-dev
Dan Sandler [Thu, 31 Jul 2014 07:05:23 +0000 (07:05 +0000)]
Merge "Fix docs build." into lmp-dev

9 years agoFix docs build.
Dan Sandler [Thu, 31 Jul 2014 06:27:37 +0000 (02:27 -0400)]
Fix docs build.

Change-Id: I3be4c5b74e85d2491316986d8c3c0575cd01a8fc

9 years agoMerge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev
Jorim Jaggi [Thu, 31 Jul 2014 13:46:24 +0000 (13:46 +0000)]
Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev

9 years agoFactor out keyguard components of StatusBarHeaderView
Jorim Jaggi [Wed, 30 Jul 2014 13:43:13 +0000 (15:43 +0200)]
Factor out keyguard components of StatusBarHeaderView

Make the header on keyguard a separate view, and move all Keyguard
components from StatusBarHeader into KeyguardHeaderView.

Change-Id: I1e2400d5c91898df3824fd8f27b10750d576a62c

9 years agoMerge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev
Wonsik Kim [Thu, 31 Jul 2014 06:36:59 +0000 (06:36 +0000)]
Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev

9 years agoMediaCodec: clean up image/buffer caching
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

9 years agoTIF: fix TvInputHal bug for multiple devices
Wonsik Kim [Tue, 29 Jul 2014 07:39:00 +0000 (16:39 +0900)]
TIF: fix TvInputHal bug for multiple devices

In addition, add toString() method to TvStreamConfig for easier
debugging.

Bug: 16561829, Bug: 16666251
Change-Id: Ic192aef30f4d193b73bac7bc93a1563aa9af4377

9 years agoNFC 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

9 years agoAdd 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

9 years agocamera2: 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

9 years agoAdds 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

9 years agocamera2: 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

9 years agoAdd 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

9 years agoSupport 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

9 years agoMerge "Revert "NFC Unlock api changes"" into lmp-dev
Andres Morales [Wed, 30 Jul 2014 21:31:01 +0000 (21:31 +0000)]
Merge "Revert "NFC Unlock api changes"" into lmp-dev

9 years agoRevert "NFC Unlock api changes"
Andres Morales [Wed, 30 Jul 2014 21:30:50 +0000 (21:30 +0000)]
Revert "NFC Unlock api changes"

This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3

9 years agoNFC Unlock api changes
Andres Morales [Wed, 23 Jul 2014 19:39:55 +0000 (12:39 -0700)]
NFC Unlock api changes

Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed

9 years agoam a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection...
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

9 years agoam 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line...
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""

9 years agoam 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneou...
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""

9 years agoam ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions...
Joe Fernandez [Wed, 30 Jul 2014 18:14:04 +0000 (18:14 +0000)]
am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit 'ecf76d1cfd2846412270e6361ec8ba4cfccf8bec':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

9 years agoam b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ...
Joe Fernandez [Wed, 30 Jul 2014 18:09:27 +0000 (18:09 +0000)]
am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit 'b83127f0cf35a2d95684293818ca25171f6643e1':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

9 years agoam b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in...
Alan Lau [Wed, 30 Jul 2014 17:47:03 +0000 (17:47 +0000)]
am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

* commit 'b12318be13be00842d124e4391ce5eabce2d5104':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

9 years agoam 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copyin...
Alan Lau [Wed, 30 Jul 2014 17:44:20 +0000 (17:44 +0000)]
am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '06a8455421978d06597de2abfccabef928d06056':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""

9 years agoam d46bc784: am 81364215: Merge "docs: Revised page to include info about new Publish...
Andrew Solovay [Wed, 30 Jul 2014 17:37:06 +0000 (17:37 +0000)]
am d46bc784: am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs

* commit 'd46bc7845c221b84f9b4e570b95f407c7fc6d0e7':
  docs: Revised page to include info about new Publisher API.

9 years agoam c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU...
Alan Lau [Wed, 30 Jul 2014 17:37:02 +0000 (17:37 +0000)]
am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev

* commit 'c006227265d7ac705ebeef2f7d87104fdb63f32a':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""

9 years agoam 81364215: Merge "docs: Revised page to include info about new Publisher API."...
Andrew Solovay [Wed, 30 Jul 2014 17:34:20 +0000 (17:34 +0000)]
am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs

* commit '813642158979aca52b9d3913e52dda877d74a992':
  docs: Revised page to include info about new Publisher API.

9 years agoam b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug...
Ricardo Cervera [Wed, 30 Jul 2014 16:49:57 +0000 (16:49 +0000)]
am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs

* commit 'b6bfa9e45a953b83289ee57da661746deae7a63f':
  docs: Added system requirements for Studio. Bug: 16566355

9 years agoam a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into...
Ricardo Cervera [Wed, 30 Jul 2014 16:46:07 +0000 (16:46 +0000)]
am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs

* commit 'a7898781d6182b5c73a0a3899b71162f92582f66':
  docs: Added system requirements for Studio. Bug: 16566355

9 years agoMerge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modul...
Joe Fernandez [Wed, 30 Jul 2014 18:07:11 +0000 (18:07 +0000)]
Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

9 years agodocs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Joe Fernandez [Tue, 29 Jul 2014 21:44:28 +0000 (14:44 -0700)]
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece

9 years agoMerge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into...
Alan Lau [Wed, 30 Jul 2014 17:39:28 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

9 years agoRevert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
Alan Lau [Wed, 30 Jul 2014 17:35:29 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""

This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268

9 years agoMerge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator...
Alan Lau [Wed, 30 Jul 2014 17:32:03 +0000 (17:32 +0000)]
Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev

9 years agoRevert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
Alan Lau [Wed, 30 Jul 2014 17:30:15 +0000 (17:30 +0000)]
Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""

This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058

9 years agoMerge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular...
Ricardo Cervera [Wed, 30 Jul 2014 16:42:48 +0000 (16:42 +0000)]
Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs

9 years agoMerge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
Alan Viverette [Wed, 30 Jul 2014 21:24:41 +0000 (21:24 +0000)]
Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev

9 years agoUpdate switch assets, fix SearchView asset 9-patch areas
Alan Viverette [Wed, 30 Jul 2014 20:29:39 +0000 (13:29 -0700)]
Update switch assets, fix SearchView asset 9-patch areas

BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3

9 years agoMerge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views...
Alan Lau [Wed, 30 Jul 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

9 years agoRevert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
Alan Lau [Wed, 30 Jul 2014 17:35:20 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

This reverts commit cbeef01cce314e3a3977b042d8ec0744816c0df4.

Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb

9 years agoMerge "docs: Revised page to include info about new Publisher API." into klp-modular...
Andrew Solovay [Wed, 30 Jul 2014 17:30:05 +0000 (17:30 +0000)]
Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs

9 years agoMerge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into...
keunyoung [Wed, 30 Jul 2014 21:22:24 +0000 (21:22 +0000)]
Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev

9 years agoadd UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
keunyoung [Mon, 28 Jul 2014 20:12:50 +0000 (13:12 -0700)]
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode

- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db

9 years agoMerge "Make some NFC APIs @systemAPI." into lmp-dev
Martijn Coenen [Wed, 30 Jul 2014 21:03:32 +0000 (21:03 +0000)]
Merge "Make some NFC APIs @systemAPI." into lmp-dev

9 years agoMake some NFC APIs @systemAPI.
Martijn Coenen [Tue, 29 Jul 2014 20:54:21 +0000 (13:54 -0700)]
Make some NFC APIs @systemAPI.

Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a

9 years agoAllow 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

9 years agoMerge "Bump refcount of canvas created for Picture" into lmp-dev
Raph Levien [Wed, 30 Jul 2014 21:03:18 +0000 (21:03 +0000)]
Merge "Bump refcount of canvas created for Picture" into lmp-dev

9 years agoBump refcount of canvas created for Picture
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

9 years agoam 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.
Dirk Dougherty [Tue, 29 Jul 2014 21:07:53 +0000 (21:07 +0000)]
am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.

* commit '4ff57a9aee76bdfe6808ac9c64f2e90bc14a25ae':
  Doc change: add notice for admob sdk upgrade.

9 years agoam fa3d1b2a: Doc change: add notice for admob sdk upgrade.
Dirk Dougherty [Tue, 29 Jul 2014 21:03:25 +0000 (21:03 +0000)]
am fa3d1b2a: Doc change: add notice for admob sdk upgrade.

* commit 'fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
  Doc change: add notice for admob sdk upgrade.

9 years agodocs: Revised page to include info about new Publisher API.
Andrew Solovay [Fri, 25 Jul 2014 23:27:44 +0000 (16:27 -0700)]
docs: Revised page to include info about new Publisher API.

Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd

Page is staged to:

http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies

Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558

9 years agoDoc change: add notice for admob sdk upgrade.
Dirk Dougherty [Tue, 29 Jul 2014 01:19:46 +0000 (18:19 -0700)]
Doc change: add notice for admob sdk upgrade.

Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff

9 years agodocs: Added system requirements for Studio. Bug: 16566355
Ricardo Cervera [Fri, 25 Jul 2014 16:42:28 +0000 (09:42 -0700)]
docs: Added system requirements for Studio. Bug: 16566355

Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555

9 years agoam 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 16:34:01 +0000 (16:34 +0000)]
am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs

* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
  docs: fix typo bug 16623189

9 years agoam 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 16:30:07 +0000 (16:30 +0000)]
am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs

* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
  docs: fix typo bug 16623189

9 years agoam dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 15:42:24 +0000 (15:42 +0000)]
am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs

* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo

9 years agoam 9613b433: Merge "docs: fix typo" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 15:38:02 +0000 (15:38 +0000)]
am 9613b433: Merge "docs: fix typo" into klp-modular-docs

* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo

9 years agoam 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio...
Ricardo Cervera [Tue, 29 Jul 2014 15:32:57 +0000 (15:32 +0000)]
am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs

* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio

9 years agoam 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp...
Ricardo Cervera [Tue, 29 Jul 2014 15:29:00 +0000 (15:29 +0000)]
am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs

* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio

9 years agoam df881ccc: am 321e0302: docs: Fix Wear docs issues.
Ricardo Cervera [Tue, 29 Jul 2014 15:07:56 +0000 (15:07 +0000)]
am df881ccc: am 321e0302: docs: Fix Wear docs issues.

* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.

9 years agoam 321e0302: docs: Fix Wear docs issues.
Ricardo Cervera [Tue, 29 Jul 2014 15:01:11 +0000 (15:01 +0000)]
am 321e0302: docs: Fix Wear docs issues.

* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.

9 years agoam d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice."...
Filip Gruszczynski [Mon, 28 Jul 2014 23:40:13 +0000 (23:40 +0000)]
am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev

* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.

9 years agoam 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
Craig Mautner [Mon, 28 Jul 2014 23:28:59 +0000 (23:28 +0000)]
am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.

9 years agoMerge "docs: fix typo bug 16623189" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 16:26:51 +0000 (16:26 +0000)]
Merge "docs: fix typo bug 16623189" into klp-modular-docs

9 years agodocs: fix typo bug 16623189
Robert Ly [Tue, 29 Jul 2014 16:25:45 +0000 (09:25 -0700)]
docs: fix typo bug 16623189

Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799

9 years agodocs: fix typo
Robert Ly [Tue, 29 Jul 2014 15:33:17 +0000 (08:33 -0700)]
docs: fix typo

Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358

9 years agoMerge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
Craig Mautner [Mon, 28 Jul 2014 23:25:55 +0000 (23:25 +0000)]
Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

9 years agoRemove PendingActivityLaunches based on stack.
Craig Mautner [Mon, 28 Jul 2014 21:00:35 +0000 (14:00 -0700)]
Remove PendingActivityLaunches based on stack.

Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52