OSDN Git Service
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Muyuan Li [Mon, 8 Aug 2016 17:43:10 +0000 (17:43 +0000)]
Merge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev
Jason Monk [Mon, 8 Aug 2016 15:32:46 +0000 (15:32 +0000)]
Merge "QS: Tweak animation paths when few icons" into nyc-mr1-dev
Jason Monk [Mon, 8 Aug 2016 15:32:23 +0000 (15:32 +0000)]
Merge "QS: Fix expanding on closing detail" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 14:52:04 +0000 (14:52 +0000)]
Merge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 13:42:34 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 13:40:43 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 8 Aug 2016 11:16:48 +0000 (04:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia177ed731331dbc6420eafe17a1615a7bc65dac2
Auto-generated-cl: translation import
Bill Yi [Mon, 8 Aug 2016 11:01:55 +0000 (04:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib195a4f4c102694bc911d6987dc1506f511cadd4
Auto-generated-cl: translation import
Bill Yi [Mon, 8 Aug 2016 04:46:38 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b7b641340466819a50ee8838278b352948891f9
Auto-generated-cl: translation import
Tyler Gunn [Mon, 8 Aug 2016 00:33:43 +0000 (00:33 +0000)]
Merge "Add Connection Event for wifi handover failures." into nyc-mr1-dev
Muyuan Li [Sun, 7 Aug 2016 03:24:06 +0000 (20:24 -0700)]
Prevents screenshot layer from dismissing IME.
Add code to adjustWindowLw to force the flag
FLAG_NOT_FOCUSABLE to be set for layer type
TYPE_SCREENSHOT.
Bug:
30485483
Change-Id: I11725eb89fda59b6d50fa1700845cdfe9ffb930b
TreeHugger Robot [Sat, 6 Aug 2016 18:18:55 +0000 (18:18 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev
Doris Liu [Sat, 6 Aug 2016 01:07:14 +0000 (01:07 +0000)]
Merge "Remove animation value change from push staging" into nyc-mr1-dev
Doris Liu [Sat, 6 Aug 2016 00:47:02 +0000 (00:47 +0000)]
Merge "Support repeatMode = reverse in AVD" into nyc-mr1-dev
Phil Weaver [Fri, 5 Aug 2016 23:28:46 +0000 (23:28 +0000)]
Merge "Improve handling of crashing a11y services." into nyc-mr1-dev
Chris Tate [Fri, 5 Aug 2016 22:48:56 +0000 (22:48 +0000)]
Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev
Yohei Yukawa [Fri, 5 Aug 2016 22:38:55 +0000 (15:38 -0700)]
Make sure IME focus is synced to View focus
This CL fixes an edge case that my previous CL [1] forgot to handle.
The goal of my previous CL was to avoid InputMethodManager from getting
confused by a false focus-in event from temporarily detached Views.
However, my CL forgot to take care of the case where the temporarily
detached View is still focused even after the temporary detach mode is
done.
The bad news is that such a situation is relatively easy to trigger by
having a ListView that has EditText as follows, which seems to be
known to be a common technique in Android developer community to put an
EditText in a ListView.
ListView#listView.addHeaderView(new EditText(context), null, true);
If the ListView is initialized as above, and the EditText has input
focus, View focus and IME focus start to disagree immediatelly after the
ListView's layout is re-evaluated. This is really easy to trigger, for
example just by dismissing the IME window.
In summary, the root cause is that InputMethodManager#focusIn(View) is
now always ignored as long as the View is temporarily detached, under an
assumption that IMM#focusIn(View) will be called back again with a View
that is not temporarily detached when everything is stable. Hence the
fix is to do so by hooking up View#dispatchFinishTemporaryDetach() to
call IMM#focusIn(View) again when the View is actually focused in the
final state.
[1]: Ia79bbd8468f768d546354382b47b39dd31ef7bb5
a4ed0cfcb6885beeb52f701bfc64c393b668f7ba
Bug:
30022872
Bug:
30578745
Bug:
30706985
Change-Id: Iecbdb00dcef8c72e4f7b31035c9bf0f4a40a578f
TreeHugger Robot [Fri, 5 Aug 2016 22:38:20 +0000 (22:38 +0000)]
Merge "Not trying to remove admins already being removed" into nyc-mr1-dev
Christopher Tate [Fri, 5 Aug 2016 20:21:45 +0000 (13:21 -0700)]
Reschedule date-change alarm whenever the time is set
Bug
30628519
Change-Id: Ic4180b9f3c822f3dfb7e35199f3d058938acf778
TreeHugger Robot [Fri, 5 Aug 2016 20:50:45 +0000 (20:50 +0000)]
Merge "Switch volume animation to Scene." into nyc-mr1-dev
Chong Zhang [Fri, 5 Aug 2016 20:04:54 +0000 (20:04 +0000)]
Merge "Fix WM missing stack/task when activity is force stopped and restarted" into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 19:32:48 +0000 (19:32 +0000)]
Merge "Correctly initialize rotation animation hint." into nyc-mr1-dev
Julia Reynolds [Mon, 25 Jul 2016 12:55:15 +0000 (08:55 -0400)]
Switch volume animation to Scene.
animateLayoutChanges is too janky.
Bug:
30070005
Change-Id: I88bb94c2de18a8ebc14f0f0aed48877a8b328d8a
Chong Zhang [Fri, 5 Aug 2016 00:55:21 +0000 (17:55 -0700)]
Fix WM missing stack/task when activity is force stopped and restarted
When activity process is force-stopped (like in the case we need to stop
it to allow debugger), activity record is removed and a new instance is
added. Depending on timing, adding of new record could happen before
or after old record is removed. If it added after old record is removed,
then the removal could cause AM to also remove the task AND the stack
(if the activity is the last one).
On WM side however, the task/stack removal could be delayed due to
animation. So when AM attaches a new stack, we end up with two stacks
with the same stack id in the DisplayContent. Also, AM reuses the last
used taskId after it's deleted. So WM is confused and didn't add a new
task record. Then when the delayed stack removal fires everything is gone.
We need to use a different task id when creating a new task record, even
if the last created task is already deleted. Also when attaching a new
stack to WM, first check if we already have such a stack in DisplayContent,
if so, reattach it and don't create a duplicate.
bug:
30465601
Change-Id: Ic399a32c54f6acdcbb9a0c6155599331d55df232
Adrian Roos [Fri, 5 Aug 2016 18:37:27 +0000 (18:37 +0000)]
Merge changes from topic 'smooth_unlock' into nyc-mr1-dev
* changes:
Keyguard: Improve trusted unlock while occluded
Keyguard: Refactoring for improving trusted unlock while occluded
Tyler Gunn [Fri, 5 Aug 2016 18:22:34 +0000 (11:22 -0700)]
Add Connection Event for wifi handover failures.
Adding a new connection event which Telephony can use to inform upper
layers of a failure to handover to WIFI.
Bug:
30697460
Change-Id: I75da2f956a6b70a9bf4cf7128f29968e08172dc3
Chris Tate [Fri, 5 Aug 2016 18:04:23 +0000 (18:04 +0000)]
Merge "Fix "adb backup -shared"" into nyc-mr1-dev
Robert Carr [Fri, 5 Aug 2016 17:25:21 +0000 (10:25 -0700)]
Correctly initialize rotation animation hint.
In the case of no activity options we won't initialize
it again later, and so we will override the apps request
with a hint of 0 (ROTATION_ANIMATION_ROTATE).
Bug:
30683604
Change-Id: I5eed12adfbb241859503bcd40f15ee82141436d8
John Reck [Fri, 5 Aug 2016 17:50:36 +0000 (10:50 -0700)]
Ensure Dequeue/Queue duration is always set
Bug:
30662749
Change-Id: I35a4c26ce78536fc7a506ec2f92a8b9eecb12ec2
TreeHugger Robot [Fri, 5 Aug 2016 17:37:34 +0000 (17:37 +0000)]
Merge "Move EphemeralResolverService" into nyc-mr1-dev
Rob Carr [Fri, 5 Aug 2016 17:00:19 +0000 (17:00 +0000)]
Merge "WindowManager: Restore update behavior of mLastFrame." into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 15:49:10 +0000 (15:49 +0000)]
Merge "QS: Fix accidental a11y tile removal" into nyc-mr1-dev
Wyatt Riley [Fri, 5 Aug 2016 15:17:21 +0000 (15:17 +0000)]
Merge "LocationManager - Handle Shutdown for right User" into nyc-mr1-dev
Todd Kennedy [Thu, 4 Aug 2016 21:27:15 +0000 (14:27 -0700)]
Move EphemeralResolverService
It should not have been under com.android.internal
Fixes:
30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
Jason Monk [Fri, 5 Aug 2016 14:08:11 +0000 (10:08 -0400)]
QS: Fix accidental a11y tile removal
Change-Id: I5b5c3bac0b92a7cc5585dcd55571fa055da0e5eb
Fixes:
30443933
TreeHugger Robot [Fri, 5 Aug 2016 11:53:57 +0000 (11:53 +0000)]
Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 11:53:37 +0000 (11:53 +0000)]
Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev
Doris Liu [Thu, 4 Aug 2016 00:54:28 +0000 (17:54 -0700)]
Support repeatMode = reverse in AVD
BUG:
30641232
Change-Id: I34c823a0a45c8441873a9b467275174c5529994b
Phil Weaver [Fri, 5 Aug 2016 00:37:17 +0000 (00:37 +0000)]
Merge "Only filter a11y motion events if needed." into nyc-mr1-dev
Wyatt Riley [Thu, 4 Aug 2016 23:10:06 +0000 (16:10 -0700)]
LocationManager - Handle Shutdown for right User
Only process a shutdown when it is for all users (whole system),
not a single user
Change-Id: Id51b7fb4606460462c2f6749e5ac3984bdd8319f
Bug:
30646142
Christopher Tate [Fri, 5 Aug 2016 00:13:25 +0000 (17:13 -0700)]
Fix "adb backup -shared"
An accidental side-effect of introducing the XML content file and its
domain semantic checking was that the shared-storage domain got
dropped on the floor. Now the mechanism understands what it means
again.
Bug
29999884
Change-Id: I22b99c96869683d1a92430f237dda54b170b8f60
Adrian Roos [Thu, 4 Aug 2016 21:52:06 +0000 (14:52 -0700)]
Keyguard: Improve trusted unlock while occluded
Smoothly unlocks device when going from a SHOW_WHEN_LOCKED activity
to a DISMISS_KEYGUARD activity while the device is trusted.
This change suppresses the jank from going briefly through the
lockscreen if the device is trusted and unlockable without entering
a credential.
Bug:
27410215
Change-Id: Idd86e825d37a89538a0a1f690daf6afcf94a0699
Suprabh Shukla [Thu, 4 Aug 2016 23:24:45 +0000 (16:24 -0700)]
Not trying to remove admins already being removed
If someone calls removeActiveAdminLocked more than once, it is possible
for the device policy data to end up with more than one copy of an admin
in the list mRemovingAdmins. Due to extra entries, once the admin
component is removed, it is not being allowed to be set as an admin again,
until the device reboots or mRemovingAdmins is cleared from the memory
due to some other reason. Fixing this by making sure we do not add
duplicate entries to mRemovingAdmins
Bug:
30369197
Change-Id: I1d53c41312171425bbd6e6e4153148276f1b098d
Adrian Roos [Thu, 4 Aug 2016 21:50:48 +0000 (14:50 -0700)]
Keyguard: Refactoring for improving trusted unlock while occluded
- Adds a trusted signal from Keyguard to PhoneWindowManager
- Allows PhoneWindowManager to exempt DISMISS_KEYGUARD windows from force hiding
- Allows PhoneWindowManager to dismiss Keyguard while occluded
Bug:
27410215
Change-Id: I3ad490b64a5805b6f3888a9f37fcfbdd0116395e
Doris Ling [Thu, 4 Aug 2016 23:39:37 +0000 (23:39 +0000)]
Merge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev
Adrian Roos [Thu, 4 Aug 2016 23:24:03 +0000 (23:24 +0000)]
Merge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev
Adrian Roos [Thu, 4 Aug 2016 23:06:45 +0000 (23:06 +0000)]
Merge "Only reorient nav bar if needed" into nyc-mr1-dev
Phil Weaver [Tue, 2 Aug 2016 21:30:44 +0000 (14:30 -0700)]
Only filter a11y motion events if needed.
We've seen some jitter in motion events with accessibility
enabled. We can eliminate it by not passing motion events
through the filter if we know they won't be affected.
Bug:
30183085
Change-Id: I0ecc8d5a39c8e370fc3a8ab85c6357251a31f8ad
Phil Weaver [Sat, 30 Jul 2016 00:26:41 +0000 (17:26 -0700)]
Improve handling of crashing a11y services.
We were confusing handling of services that were unbound with
those that had crashed. We would lose track of services that
has crashed, start new ones, and then when the system restarted
a killed services we would have multiple instances running. It
was possible for this to get very out of hand.
Bug:
30306689
Change-Id: I4e63d25b6d2fec3ec68f450a4602898c43a2b2ad
Doris Liu [Thu, 4 Aug 2016 20:20:17 +0000 (13:20 -0700)]
Remove animation value change from push staging
This CL ensures that animation values are only updated during
animation pulses.
This CL also includes the revert of
https://googleplex-android-review.git.corp.google.com/#/c/
1285913/
BUG:
30659748
Change-Id: Iadc84462dc61157efd3c18a23767bba9faf00f6e
Annie Chin [Thu, 4 Aug 2016 22:08:15 +0000 (22:08 +0000)]
Merge "setCarMode() only when car mode changes" into nyc-mr1-dev
Ruben Brunk [Thu, 4 Aug 2016 21:59:50 +0000 (21:59 +0000)]
Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev
Dianne Hackborn [Thu, 4 Aug 2016 21:56:24 +0000 (21:56 +0000)]
Merge "Fix issue #
30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev
Ruben Brunk [Thu, 4 Aug 2016 21:50:25 +0000 (14:50 -0700)]
Don't crash system server when setting scheduler.
Bug:
30671326
Change-Id: I2f7913cd3cca052d5a653ff288459b0a6a69deda
Dianne Hackborn [Thu, 4 Aug 2016 21:00:22 +0000 (14:00 -0700)]
Fix issue #
30647973: stopForeground() doesn't remove notification
Ignore the service that is actually trying to remove its notification.
Change-Id: I1293300cf2a4bea7c512df7b2242a18dcc25d1c6
TreeHugger Robot [Thu, 4 Aug 2016 20:53:55 +0000 (20:53 +0000)]
Merge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev
Fyodor Kupolov [Thu, 4 Aug 2016 20:52:00 +0000 (20:52 +0000)]
Merge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev
Doris Ling [Thu, 4 Aug 2016 20:21:53 +0000 (13:21 -0700)]
Add metrics event for Settings->Display->Ambient Display.
Bug:
29994493
Change-Id: I2eb71063db254cbe92511ca5cbe93b32c6b2c601
Robert Carr [Thu, 4 Aug 2016 20:16:55 +0000 (13:16 -0700)]
WindowManager: Restore update behavior of mLastFrame.
We need to always update mLastFrame like we used to. Moving
the update inside the conditional caused it to not update on position
changes.
Bug:
30665565
Bug:
30641229
Change-Id: Ic71e8a8f91765870ebe2c0559f61aa83540c3a0d
Philip P. Moltmann [Thu, 4 Aug 2016 20:08:32 +0000 (20:08 +0000)]
Merge "Add (corrected) usb power sink handling" into nyc-mr1-dev
Hemal Patel [Thu, 4 Aug 2016 19:48:18 +0000 (19:48 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am:
ca7eee3d11
am:
ab35b73d1b
Change-Id: I37c06297dce5822845d044c82f8e030d23ea850f
Hemal Patel [Thu, 4 Aug 2016 19:48:15 +0000 (19:48 +0000)]
Docs: Fixed info about spanning multiple columns am:
64e88cd296
am:
611f50d62f
Change-Id: If7a6f08237c51b49ad4a550c25c020b8a7a5d0b3
TreeHugger Robot [Thu, 4 Aug 2016 19:45:25 +0000 (19:45 +0000)]
Merge "Fixed year on copyright notice." into nyc-mr1-dev
Hemal Patel [Thu, 4 Aug 2016 19:43:20 +0000 (19:43 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
am:
ca7eee3d11
Change-Id: I94b5abbf1d292a01ba439cafd80938f7fc92854d
Hemal Patel [Thu, 4 Aug 2016 19:43:18 +0000 (19:43 +0000)]
Docs: Fixed info about spanning multiple columns
am:
64e88cd296
Change-Id: I8c4219e946fddbfc023bbe77549cc12fc0b6bd3a
Hemal Patel [Thu, 4 Aug 2016 19:38:41 +0000 (19:38 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
Makoto Onuki [Thu, 4 Aug 2016 19:29:25 +0000 (19:29 +0000)]
Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev
Bert McMeen [Thu, 4 Aug 2016 18:28:47 +0000 (18:28 +0000)]
Docs: Fixed typo in API Overview am:
844c43a904
am:
653b768997
Change-Id: I56caec3330282d1acf9772d0ad21c27b31e2f602
TreeHugger Robot [Thu, 4 Aug 2016 18:25:10 +0000 (18:25 +0000)]
Merge "only rate limit notification updates" into nyc-mr1-dev
Bert McMeen [Thu, 4 Aug 2016 18:20:51 +0000 (18:20 +0000)]
Docs: Fixed typo in API Overview
am:
844c43a904
Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4
Bert McMeen [Thu, 4 Aug 2016 18:09:25 +0000 (18:09 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
am:
62faea4f12
Change-Id: I29a6d5c083e527643cea4da8e666ba363040364e
Bert McMeen [Thu, 4 Aug 2016 18:09:22 +0000 (18:09 +0000)]
Docs: Fixed typo in API Overview
am:
f27ab3c126
Change-Id: I64dced0229d1017f30a34790a8adfb36ed9e3d67
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview
Bug:
30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit
f27ab3c12625f34a4221477001a603390b505e65)
Bert McMeen [Thu, 4 Aug 2016 18:01:27 +0000 (18:01 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
Jeff Sharkey [Thu, 4 Aug 2016 17:51:18 +0000 (17:51 +0000)]
Merge "We don't need to wait to pin the camera app." into nyc-mr1-dev
Chris Wren [Thu, 4 Aug 2016 15:24:42 +0000 (11:24 -0400)]
only rate limit notification updates
Updates to progress bars are the main culprit in system
performance events caused by apps spamming the notification
service. Rate-limiting only updates allows us to set a lower
threshold wihtout the owrry of mistakenly dropping bursts of
notifications being quickly posted after a network sync.
Also reduce logspam caused by the rate-limit events.
Bug:
30132961
Change-Id: I49acda6a2831204da45e899ddd3d62d571d7174b
Jorim Jaggi [Thu, 4 Aug 2016 15:28:08 +0000 (17:28 +0200)]
Call userActivity when dismissing keyguard
So we don't run into weird race conditions which could leave Keyguard
unlocked.
Also add some missing debug statements for future investigation.
Change-Id: I7bd463f594d53ddfa84cebc28cf1f63dd2d6c533
Fixes:
28987945
John Reck [Thu, 4 Aug 2016 14:55:38 +0000 (07:55 -0700)]
Fix NPE in TextureView
Bug:
30651595
Change-Id: Ic6cc2a1598de173aaadb4061562236a563a662b3
Jorim Jaggi [Thu, 4 Aug 2016 11:55:39 +0000 (13:55 +0200)]
Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake
The whole sequence is different as Keyguard is occluded. Thus, we are not
doing the normal keyguard exit sequence, but jump directly to dismissing
the Keyguard.
Normally the sequence is:
- keyguardDone
- notifyScreenTurningOn
- startKeyguardExitAnim
In the occluded case, it is:
- keyguardDone
- startKeyguardExitAnim
- notifyScreenTurningOn
Now, the following issues cause the flickering in the occluded case, which
are normally not causing any breakage:
- There was an issued with the draw callback not being reset and reused
at the wrong time.
- mWakeAndUnlocking was not cleared soon enough. This caused a timeout if
notifyScreenTurningOn happens after starKeyguardExitAnim
- We always need to wait for the Keyguard host window, as isForceHiding
isn't set in this case
Change-Id: Id8d0f9fec79ec63b36659513f97c724147c7521f
Fixes:
30483392
TreeHugger Robot [Thu, 4 Aug 2016 09:21:54 +0000 (09:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:16:49 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 4 Aug 2016 05:54:00 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a81de7d9ce7f2d36d5a004fd61c2bb48202525c
Auto-generated-cl: translation import
Bill Yi [Thu, 4 Aug 2016 05:39:09 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b89c62d8f27b4827b77ada214c318ae7207a680
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 4 Aug 2016 03:35:35 +0000 (03:35 +0000)]
Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev
Sreevani Sreejith [Thu, 4 Aug 2016 02:38:47 +0000 (02:38 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs am:
3faf6114b0
am:
f5a2fbc156
Change-Id: I37eb8462dcf65783d64c71336ee0d7fc8a354c4e
sreevanis [Thu, 4 Aug 2016 02:38:44 +0000 (02:38 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs am:
d5cabb92bc
am:
fdaac48e99
Change-Id: I8a1aa4000efa91d07d2d90dc8dd8938b30aed919
sreevanis [Thu, 4 Aug 2016 02:23:43 +0000 (02:23 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
am:
3faf6114b0
Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6
sreevanis [Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs
am:
d5cabb92bc
Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
Sreevani Sreejith [Thu, 4 Aug 2016 02:14:25 +0000 (02:14 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
Meng Wang [Thu, 4 Aug 2016 02:12:12 +0000 (02:12 +0000)]
Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev
Fyodor Kupolov [Thu, 4 Aug 2016 02:05:25 +0000 (19:05 -0700)]
Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE
Bug:
30644237
Change-Id: I891cd3b73e47c851cc512a8e768ebd7061c950d9
TreeHugger Robot [Thu, 4 Aug 2016 01:27:33 +0000 (01:27 +0000)]
Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev
Kevin Hufnagle [Thu, 4 Aug 2016 01:23:54 +0000 (01:23 +0000)]
docs: Updated wording of callout describing device opt-out options. am:
b48909ed52
am:
bdbe6fd94f
Change-Id: Id995adadf9dab72a2c5bc70a96a82220937bc7fe
Joe Fernandez [Thu, 4 Aug 2016 01:14:48 +0000 (01:14 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am:
51a582fa85
am:
6ad22ca614
Change-Id: I458b83999db483a628a2d33a4f3a4037c6f8b7be
Joe Fernandez [Thu, 4 Aug 2016 01:14:43 +0000 (01:14 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am:
712c053462
am:
337279df50
Change-Id: Id7cc9a79f3f306df0aab10921c9b05809763293f
Joe Fernandez [Thu, 4 Aug 2016 01:14:37 +0000 (01:14 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am:
d6f1d8ea28
am:
0af74fa732
Change-Id: Ie793990d142720d4d901b4e550446cce880d1a36
Kevin Hufnagle [Thu, 4 Aug 2016 01:13:52 +0000 (01:13 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC am:
684d849621
am:
a007a4d772
Change-Id: Ia081e1e0be8059188b617e68b17ea34b4d8c409e
Kevin Hufnagle [Thu, 4 Aug 2016 01:13:21 +0000 (01:13 +0000)]
docs: Added page on DAC describing ARC manifest file considerations. am:
178caa888f
am:
ebd455b077
Change-Id: Id17e778bbd197afbf9c16a85ef9756358fbb27f4