OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge changes Iad270dfd,Ice608e6d,I375369a8
Winson Chung [Thu, 2 Feb 2017 00:23:05 +0000 (00:23 +0000)]
Merge changes Iad270dfd,Ice608e6d,I375369a8

* changes:
  Adding initial TRON logging for picture-in-picture.
  Disallow entering PiP when activity is locked.
  Preventing cases where an app can be stopped while entering PiP.

7 years agoMerge "Start MtpDocumentsService as foreground service."
TreeHugger Robot [Thu, 2 Feb 2017 00:13:28 +0000 (00:13 +0000)]
Merge "Start MtpDocumentsService as foreground service."

7 years agoStart MtpDocumentsService as foreground service.
Daichi Hirono [Thu, 26 Jan 2017 05:40:19 +0000 (14:40 +0900)]
Start MtpDocumentsService as foreground service.

Prevously MtpDocumentsService was started as background service, then it
turns into a foreground service by calling Service#startForeground.

The workflow did not work until this, because now background activity
cannot launch a background service.

The CL starts using NotificationManager#startForegroundService to launch
MtpDocumentsService so that the service can be started as foreground
service directly.

Bug: 34468813
Test: MtpDocumentsProviderTests
Test: manual testing with connecting MTP device to Android
Change-Id: Ic35d3e92f234881846e5d82ed04d6681a83035f7

7 years agoMerge "Removing extraneous translations"
Mark Renouf [Wed, 1 Feb 2017 23:30:50 +0000 (23:30 +0000)]
Merge "Removing extraneous translations"

7 years agoMerge "Fix a bug in View#hasFocusable with new auto-focusable behavior"
TreeHugger Robot [Wed, 1 Feb 2017 23:23:38 +0000 (23:23 +0000)]
Merge "Fix a bug in View#hasFocusable with new auto-focusable behavior"

7 years agoMerge "Scale PiP to stack instead of crop."
TreeHugger Robot [Wed, 1 Feb 2017 23:14:12 +0000 (23:14 +0000)]
Merge "Scale PiP to stack instead of crop."

7 years agoMerge "Allow opening activity to specify orientation."
Bryce Lee [Wed, 1 Feb 2017 22:54:28 +0000 (22:54 +0000)]
Merge "Allow opening activity to specify orientation."

7 years agoMerge "Explicitly destroy Layer in DeferredLayerUpdater on destroyHardwareResources()"
Sergei Vasilinetc [Wed, 1 Feb 2017 22:52:16 +0000 (22:52 +0000)]
Merge "Explicitly destroy Layer in DeferredLayerUpdater on destroyHardwareResources()"

7 years agoMerge "Properly clear textures for Hardware Bitmaps"
Sergei Vasilinetc [Wed, 1 Feb 2017 22:47:59 +0000 (22:47 +0000)]
Merge "Properly clear textures for Hardware Bitmaps"

7 years agoMerge "Backbone of the new aapt2 strip command."
Pierre Lecesne [Wed, 1 Feb 2017 21:15:07 +0000 (21:15 +0000)]
Merge "Backbone of the new aapt2 strip command."

7 years agoMerge "Cleanup hwbinder getService code." am: 9be24a3040 am: 4ede371d80 am: ec840d1464
Steven Moreland [Wed, 1 Feb 2017 21:08:00 +0000 (21:08 +0000)]
Merge "Cleanup hwbinder getService code." am: 9be24a3040 am: 4ede371d80 am: ec840d1464
am: 8bb391016b

Change-Id: I56d2b0c8d466e78316497264b7ca96f6526b3d9d

7 years agoMerge "Cleanup hwbinder getService code." am: 9be24a3040 am: 4ede371d80
Steven Moreland [Wed, 1 Feb 2017 21:03:54 +0000 (21:03 +0000)]
Merge "Cleanup hwbinder getService code." am: 9be24a3040 am: 4ede371d80
am: ec840d1464

Change-Id: I83a7077f07689dc57ac4d8828508443cc4385292

7 years agoMerge "Add a filter for audio apps."
Daniel Nishi [Wed, 1 Feb 2017 21:01:51 +0000 (21:01 +0000)]
Merge "Add a filter for audio apps."

7 years agoMerge "Cleanup hwbinder getService code." am: 9be24a3040
Steven Moreland [Wed, 1 Feb 2017 20:57:59 +0000 (20:57 +0000)]
Merge "Cleanup hwbinder getService code." am: 9be24a3040
am: 4ede371d80

Change-Id: Ia0f3f88d8881f89cec6939dbb44d7dbbb8da9a7f

7 years agoMerge "Fix setting null target fragments"
TreeHugger Robot [Wed, 1 Feb 2017 20:54:49 +0000 (20:54 +0000)]
Merge "Fix setting null target fragments"

7 years agoMerge "Cleanup hwbinder getService code."
Steven Moreland [Wed, 1 Feb 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Cleanup hwbinder getService code."
am: 9be24a3040

Change-Id: Idb75f2c41e6e0fd9c2eb03ef4960e40cb6556308

7 years agoMerge "App Widget Service with dump in protobuf format"
Mario Bertschler [Wed, 1 Feb 2017 20:47:01 +0000 (20:47 +0000)]
Merge "App Widget Service with dump in protobuf format"

7 years agoMerge "Cleanup hwbinder getService code."
Treehugger Robot [Wed, 1 Feb 2017 20:46:45 +0000 (20:46 +0000)]
Merge "Cleanup hwbinder getService code."

7 years agoProperly clear textures for Hardware Bitmaps
sergeyv [Wed, 1 Feb 2017 18:27:33 +0000 (10:27 -0800)]
Properly clear textures for Hardware Bitmaps

Test: manual  (Description in the bug)
bug:34858530
Change-Id: I13eb89077c43ca28436509a7af5b7c11374446c4

7 years agoAllow opening activity to specify orientation.
Bryce Lee [Tue, 24 Jan 2017 19:05:01 +0000 (11:05 -0800)]
Allow opening activity to specify orientation.

An activity's window is initially not visible. This means it is not
accounted for until it becomes visible, which means requested
orientations will not be honored until after onCreate.

This changelist removes the visibility check previously used determining
the orientation.

This changelist also addresses an issue where an ActivityRecord member
variable tracking the last configuration sent was not being initially
updated.

Fixes: 33844887
Fixes: 33814250
Fixes: 34165818
Fixes: 34177026
Fixes: 33809086
Fixes: 34111451
Fixes: 33844423

Test: Verified reported issues fixed in apps mentioned in bugs
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerTests
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts.ActivityManagerAppConfigurationTests
Change-Id: If9243792b9f2d137dc5addbf6fb735a0048fa192

7 years agoMerge "Check disqualifying notifications synchronously."
Julia Reynolds [Wed, 1 Feb 2017 20:25:11 +0000 (20:25 +0000)]
Merge "Check disqualifying notifications synchronously."

7 years agoMerge "Deprecate notification fields"
Julia Reynolds [Wed, 1 Feb 2017 20:24:19 +0000 (20:24 +0000)]
Merge "Deprecate notification fields"

7 years agoMerge "Correct accessibility check for current user"
Phil Weaver [Wed, 1 Feb 2017 20:16:59 +0000 (20:16 +0000)]
Merge "Correct accessibility check for current user"

7 years agoMerge "Fix incorrect comments"
TreeHugger Robot [Wed, 1 Feb 2017 20:14:00 +0000 (20:14 +0000)]
Merge "Fix incorrect comments"

7 years agoMerge "Remove unneeded callbacks to systemui."
Julia Reynolds [Wed, 1 Feb 2017 20:03:48 +0000 (20:03 +0000)]
Merge "Remove unneeded callbacks to systemui."

7 years agoMerge "AOD: Fix in-place ambient layout updates"
Adrian Roos [Wed, 1 Feb 2017 20:02:08 +0000 (20:02 +0000)]
Merge "AOD: Fix in-place ambient layout updates"

7 years agoMerge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 am: 9f1ccbf5f9 am:...
Brad Ebinger [Wed, 1 Feb 2017 19:58:06 +0000 (19:58 +0000)]
Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 am: 9f1ccbf5f9 am: cb8180033a
am: aca8a2a707

Change-Id: I2dc6102e9bd875603f26fcfb87ce34b1a72e1a23

7 years agoMerge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 am: 9f1ccbf5f9
Brad Ebinger [Wed, 1 Feb 2017 19:53:27 +0000 (19:53 +0000)]
Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 am: 9f1ccbf5f9
am: cb8180033a

Change-Id: If5baf2ffc7b4010c6598ec730d48602b48738cc2

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 1 Feb 2017 19:51:01 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91
Brad Ebinger [Wed, 1 Feb 2017 19:49:24 +0000 (19:49 +0000)]
Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91
am: 9f1ccbf5f9

Change-Id: If9be849f743e9722ca49543a92d33d09978dc6ce

7 years agoMerge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275...
Brad Ebinger [Wed, 1 Feb 2017 19:46:55 +0000 (19:46 +0000)]
Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f am: fa1dca0ad6
am: 3aaf673c60

Change-Id: I6a6a2d136f0f31bbac984e4ba18f9f6b90808705

7 years agoMerge "Turn off Dynamic IMS switching for now"
Brad Ebinger [Wed, 1 Feb 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Turn off Dynamic IMS switching for now"
am: 2bb0d95e91

Change-Id: Ie74b53ca5f0b6463b371368608c793d402878d50

7 years agoMerge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f
Brad Ebinger [Wed, 1 Feb 2017 19:42:16 +0000 (19:42 +0000)]
Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f
am: fa1dca0ad6

Change-Id: Id2875b5b60401405e31e76eb07968798144df700

7 years agoMerge "Turn off Dynamic IMS switching for now"
Brad Ebinger [Wed, 1 Feb 2017 19:36:47 +0000 (19:36 +0000)]
Merge "Turn off Dynamic IMS switching for now"

7 years agoMerge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d
Brad Ebinger [Wed, 1 Feb 2017 19:35:56 +0000 (19:35 +0000)]
Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d
am: 6734275c2f

Change-Id: I6d502db3362aafcfed426b6598be0bd39dd38890

7 years agoScale PiP to stack instead of crop.
Robert Carr [Wed, 1 Feb 2017 18:28:28 +0000 (10:28 -0800)]
Scale PiP to stack instead of crop.

When changing stacks the finalCrop or crop may not be set
so relying on either one for the scaling factor is error prone.
Just scale to the stack size. I initially avoided this because I
thought some of the crop code may be relevant in computing the size
we wan't...but I'm now pretty sure it won't.

Test: Expand PiP back to fullscreen on phone, verify no crash.
Change-Id: I172daade74bec7374b5fd3310c1bf554e46d8832

7 years agoMerge "Adds @hide permission granting API for ImsServices"
Brad Ebinger [Wed, 1 Feb 2017 19:30:41 +0000 (19:30 +0000)]
Merge "Adds @hide permission granting API for ImsServices"
am: 390ec27f9d

Change-Id: I0f3d38811925884681d11cf18e12f1b0574d64c6

7 years agoMerge "Adds @hide permission granting API for ImsServices"
Treehugger Robot [Wed, 1 Feb 2017 19:24:10 +0000 (19:24 +0000)]
Merge "Adds @hide permission granting API for ImsServices"

7 years agoMerge "Fixed NPE during monkey testing."
TreeHugger Robot [Wed, 1 Feb 2017 19:18:14 +0000 (19:18 +0000)]
Merge "Fixed NPE during monkey testing."

7 years agoAdding initial TRON logging for picture-in-picture.
Winson Chung [Tue, 20 Dec 2016 00:18:24 +0000 (16:18 -0800)]
Adding initial TRON logging for picture-in-picture.

Bug: 33756317
Test: Run PIP activity
Change-Id: Iad270dfdf6521d4659653a0697effaed4a0d4137

7 years agoDisallow entering PiP when activity is locked.
Winson Chung [Mon, 30 Jan 2017 20:01:45 +0000 (12:01 -0800)]
Disallow entering PiP when activity is locked.

- Also ensuring that when we request for a task to be locked
  via the shell, we directly set the locked state instead of
  relying on the SystemUI to show a prompt to lock (necessary
  for the CTS test to run).

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testDisallowEnterPipActivityLocked

Change-Id: Ice608e6d8e7f018dbd5e20ae457343bfdd0a8630

7 years agoPreventing cases where an app can be stopped while entering PiP.
Winson Chung [Wed, 25 Jan 2017 21:25:22 +0000 (13:25 -0800)]
Preventing cases where an app can be stopped while entering PiP.

- Ensure that we clear the timeouts on the old stack and reschedule
  them on the new stack when moving an activity to a new stack,
  otherwise the pause timeout from the old stack will cause onStop()
  to be called.
- When adding an activity to the stopping list for processing, prevent
  scheduling an idle immediately in case an activity tries to enter
  picture-in-picture when handling onUserLeaveHint().  In that case,
  schedule an idle after the default idle delay instead.
- In addition, when resuming a resumeWhilePausing activity, prevent the
  activity idle to trigger pausing activities to be immediately put into
  a stopped state.  This was a race between the handling of pause/resume
  that would cause a pip activity to get onStop() even if it called enter
  pip on pause. Instead, when processing an idle from the activity or
  from an immediate idle scheduled by the system, we defer processing
  pausing activities until a later idle (that it reschedules).

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testEnterPipWithResumeWhilePausingActivityNoStop

Change-Id: I375369a800b7fadaa57d6e00e0564bc3ee338979
Signed-off-by: Winson Chung <winsonc@google.com>
7 years agoApp Widget Service with dump in protobuf format
Mario Bertschler [Wed, 25 Jan 2017 23:36:55 +0000 (15:36 -0800)]
App Widget Service with dump in protobuf format

Test: This protobuf format is validated as a CTS test
Bug: 33088921
Change-Id: I9d2a983052ade06cd3a13857b7e7f9e3d9bc275e

7 years agoBackbone of the new aapt2 strip command.
Pierre Lecesne [Tue, 31 Jan 2017 23:58:27 +0000 (23:58 +0000)]
Backbone of the new aapt2 strip command.

The strip command takes an APK as argument and a --target-densities flag which
contains the list of screen densities for which to optimize the APK. All
the resources that would be unused for a device having the given
densities are stripped from the APK leaving only the ones actually being
used.

Test: Manual.

Change-Id: I68368b00876a18ccdbbfc0a8dd265bd361117933

7 years agoFix setting null target fragments
Adam Powell [Wed, 1 Feb 2017 18:45:12 +0000 (10:45 -0800)]
Fix setting null target fragments

Bug 34869013
Test: CTS

Change-Id: Ibeed66f9a889a8e395bfabedcf22aebcbb848908

7 years agoMerge "Notification playback synchronized with audio focus"
Jean-Michel Trivi [Wed, 1 Feb 2017 18:43:32 +0000 (18:43 +0000)]
Merge "Notification playback synchronized with audio focus"

7 years agoCleanup hwbinder getService code.
Steven Moreland [Wed, 1 Feb 2017 17:58:00 +0000 (09:58 -0800)]
Cleanup hwbinder getService code.

- Remove memory leaks.
- Make sure proper errors are getting thrown.
- Avoid SIGABRT

Test: hidl_test_java
Change-Id: Ia5680fd0ebf83d0f174bf0d8109bf60327be5f9d

7 years agoMerge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52...
Nimrod Gileadi [Wed, 1 Feb 2017 18:10:07 +0000 (18:10 +0000)]
Merge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52" into nyc-mr2-dev-plus-aosp
am: da5289b6ed

Change-Id: I34d2a4a3945579820af1c3fdb04da53b956bf665

7 years agoAdd Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52
Nimrod Gileadi [Wed, 1 Feb 2017 18:10:00 +0000 (18:10 +0000)]
Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52
am: 0dea9e896f

Change-Id: I69418d80868e6cb27fcc82635150c47da03c3654

7 years agoAdd Wear keycodes to emulator key layout file. am: 119a06ce55 am: 9576ce6696
Nimrod Gileadi [Wed, 1 Feb 2017 18:08:49 +0000 (18:08 +0000)]
Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: 9576ce6696
am: 00620e70d5

Change-Id: Ie9e186901a6d846ee1417b1b1db9ed091e854b89

7 years agoMerge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52...
Android Build Merger (Role) [Wed, 1 Feb 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Call ActivityCallbacks after corresponding activity methods"
Sergei Vasilinetc [Wed, 1 Feb 2017 18:02:30 +0000 (18:02 +0000)]
Merge "Call ActivityCallbacks after corresponding activity methods"

7 years agoAdd Wear keycodes to emulator key layout file. am: 119a06ce55
Nimrod Gileadi [Wed, 1 Feb 2017 18:02:17 +0000 (18:02 +0000)]
Add Wear keycodes to emulator key layout file. am: 119a06ce55
am: c85e503d52

Change-Id: I6840265835199d454d735e443fb53228c0ae2fd2

7 years agoAdd Wear keycodes to emulator key layout file. am: 119a06ce55
Nimrod Gileadi [Wed, 1 Feb 2017 18:01:45 +0000 (18:01 +0000)]
Add Wear keycodes to emulator key layout file. am: 119a06ce55
am: 9576ce6696

Change-Id: Ic10c9e353a264c60cef3dac79a2fc4b57eebb244

7 years agoFix incorrect comments
Romain Guy [Wed, 1 Feb 2017 17:59:02 +0000 (09:59 -0800)]
Fix incorrect comments

Bug: 33010587
Test: comment only
Change-Id: Icdfa79bac50545bb73f4c40727fe51780ef4a56d

7 years agoAdd Wear keycodes to emulator key layout file.
Nimrod Gileadi [Wed, 1 Feb 2017 17:57:16 +0000 (17:57 +0000)]
Add Wear keycodes to emulator key layout file.
am: 119a06ce55

Change-Id: I33d2b0f9b8281c22422677f03d6046a1be0bd94f

7 years agoAdd Wear keycodes to emulator key layout file.
Nimrod Gileadi [Wed, 1 Feb 2017 17:57:11 +0000 (17:57 +0000)]
Add Wear keycodes to emulator key layout file.
am: 119a06ce55

Change-Id: Ieb06380c3bd43af7087463543960cc4ee1889050

7 years agoMerge "Revert "Allow opening activity to specify orientation.""
Bryce Lee [Wed, 1 Feb 2017 17:11:30 +0000 (17:11 +0000)]
Merge "Revert "Allow opening activity to specify orientation.""

7 years agoRevert "Allow opening activity to specify orientation."
Bryce Lee [Wed, 1 Feb 2017 17:09:18 +0000 (17:09 +0000)]
Revert "Allow opening activity to specify orientation."

This reverts commit f0a6fdbf53882949db0a141693dd33302b42d51b.

Reason for revert: Submitted before complete.

Change-Id: I545ff45b5e870c79d66884b7a2a80981293b1b24

7 years agoMerge "Allow opening activity to specify orientation."
Bryce Lee [Wed, 1 Feb 2017 17:06:08 +0000 (17:06 +0000)]
Merge "Allow opening activity to specify orientation."

7 years agoCheck disqualifying notifications synchronously.
Julia Reynolds [Wed, 1 Feb 2017 16:11:06 +0000 (11:11 -0500)]
Check disqualifying notifications synchronously.

Don't wait to check on the handler.

Test: runtest systemui-notification and
platform_testing/tests/functional/notificationtests

Change-Id: Ife1ad8bc5c40420cd6682329b8135744cfe38e4a

7 years agoMerge "Remove setDockedStackMinimized credentials prompt"
TreeHugger Robot [Wed, 1 Feb 2017 16:42:19 +0000 (16:42 +0000)]
Merge "Remove setDockedStackMinimized credentials prompt"

7 years agoFixed NPE during monkey testing.
Wale Ogunwale [Wed, 1 Feb 2017 16:12:14 +0000 (08:12 -0800)]
Fixed NPE during monkey testing.

We tried to resume key dispatching for an activity after we destroyed
it and removed its container which led to an NPE.
We now resume key dispatching for an activity if it is currently paused
just before we remove its container to not leave WM in a bad state and
also avoid NPE later on.

Change-Id: I89d366c8667e621f4515df802c6b8278fa4bd322
Fixes: 34808323
Test: adb shell monkey -p ...

7 years agoMerge "Fix a wrong UID can be logged"
Yohei Yukawa [Wed, 1 Feb 2017 16:00:09 +0000 (16:00 +0000)]
Merge "Fix a wrong UID can be logged"

7 years agoMerge "Initialize bootanimation sound on separate thread"
TreeHugger Robot [Wed, 1 Feb 2017 15:45:56 +0000 (15:45 +0000)]
Merge "Initialize bootanimation sound on separate thread"

7 years agoMerge "Blacklist more settings from backup"
Bryan Mawhinney [Wed, 1 Feb 2017 15:25:55 +0000 (15:25 +0000)]
Merge "Blacklist more settings from backup"

7 years agoDeprecate notification fields
Julia Reynolds [Tue, 31 Jan 2017 21:53:35 +0000 (16:53 -0500)]
Deprecate notification fields

And move references to the deprecated fields to
NotificationRecord for testability.

Test: runtest systemui-notification
Change-Id: If3910dc78297ad66679b1efa380315127261a018

7 years agoRemove setDockedStackMinimized credentials prompt
Robin Lee [Fri, 30 Dec 2016 17:26:25 +0000 (17:26 +0000)]
Remove setDockedStackMinimized credentials prompt

Reverts functional parts of commit 853304c0b11921db142a3945ab66fae5f0cc7d8a

This lives in a TaskStackListener now, so we just start the prompt for
activity stacks that need it, not for the whole device at once.

Bug: 31001762
Test: make -j20 && Boot, `adb shell service call trust 6 i32 {userid} i32 1`, resize docked stack.
Change-Id: I58be5174e10779f01149de1cd5c2a4db00b98490

7 years agoBlacklist more settings from backup
Bryan Mawhinney [Wed, 1 Feb 2017 13:18:07 +0000 (13:18 +0000)]
Blacklist more settings from backup

Test: run FrameworksCoreTest
Change-Id: I1b24ee1bcdae7e0d880bdc7f69dba6be07e72f1e

7 years agoAdd Wear keycodes to emulator key layout file.
Nimrod Gileadi [Wed, 1 Feb 2017 12:12:00 +0000 (12:12 +0000)]
Add Wear keycodes to emulator key layout file.

The SLEEP keycode is used by Android Wear to indicate a
"palming" gesture (covering the screen with one's hand).

The STEM_* buttons are used for side buttons on Wear.

The keycode values were added to the emulator in
http://r.android.com/330771

Bug: 19996432
Change-Id: Ib90c3b27209b0059ebc1c2cce46cc732a677d557

7 years agoMerge "Ignore smart selection for multi-word selections."
Abodunrinwa Toki [Wed, 1 Feb 2017 10:51:02 +0000 (10:51 +0000)]
Merge "Ignore smart selection for multi-word selections."

7 years agoMerge "Blacklist some new settings from backup"
Bryan Mawhinney [Wed, 1 Feb 2017 10:18:20 +0000 (10:18 +0000)]
Merge "Blacklist some new settings from backup"

7 years agoMerge "Add an API hint for metered multipath traffic."
TreeHugger Robot [Wed, 1 Feb 2017 09:54:17 +0000 (09:54 +0000)]
Merge "Add an API hint for metered multipath traffic."

7 years agoMerge "Revert "Push mapping from file extension to GID.""
TreeHugger Robot [Wed, 1 Feb 2017 08:56:51 +0000 (08:56 +0000)]
Merge "Revert "Push mapping from file extension to GID.""

7 years agoMerge "Camera2: Check for valid GPS timestamp before usage"
TreeHugger Robot [Wed, 1 Feb 2017 08:18:02 +0000 (08:18 +0000)]
Merge "Camera2: Check for valid GPS timestamp before usage"

7 years agoAdd an API hint for metered multipath traffic.
Lorenzo Colitti [Tue, 24 Jan 2017 09:08:41 +0000 (18:08 +0900)]
Add an API hint for metered multipath traffic.

This allows an application that knows how to provide seamless
network connectivity (e.g., using QUIC multipath) to find out if
doing so is desired.

Test: builds, boots, runtest frameworks-net passes.
Bug: 34630278
Change-Id: Ic7fd0b9e1cd879fdfaf84009d7125391895e9087

7 years agoMerge "Make TextViewActivityTest stable"
Keisuke Kuroyanagi [Wed, 1 Feb 2017 07:33:47 +0000 (07:33 +0000)]
Merge "Make TextViewActivityTest stable"

7 years agoMerge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0 am...
George Burgess IV [Wed, 1 Feb 2017 07:32:25 +0000 (07:32 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0 am: 820768f034
am: 142eacb409

Change-Id: I70591669041f2eb723ea8b18ce2cad28033872b0

7 years agoMerge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0
George Burgess IV [Wed, 1 Feb 2017 07:27:15 +0000 (07:27 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0
am: 820768f034

Change-Id: Id9b31425cb8ba05687ff7dfa392b230865ec18e5

7 years agoMerge "Fix a use-of-uninitialized-value warning" am: 53873df5fe
George Burgess IV [Wed, 1 Feb 2017 07:21:51 +0000 (07:21 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe
am: aea873ade0

Change-Id: I747d94158c8a1c77f8ae1076c93a3d22f6c22ef5

7 years agoMerge "Fix a use-of-uninitialized-value warning"
George Burgess IV [Wed, 1 Feb 2017 07:15:00 +0000 (07:15 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
am: 53873df5fe

Change-Id: I102fb345244f922cb41a5ce31b2de0af8e68bf97

7 years agoMerge "Fix a use-of-uninitialized-value warning"
Treehugger Robot [Wed, 1 Feb 2017 07:09:50 +0000 (07:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning"

7 years agoFix a wrong UID can be logged
Yohei Yukawa [Wed, 1 Feb 2017 05:32:26 +0000 (21:32 -0800)]
Fix a wrong UID can be logged

This is a prepartion for fixing Bug 34838583

Currently Binder.clearCallingIdentity() is called too early, which
ends up always blaming the system UID when calledWithValidToken()
fails in InputMethodManagerService#updateStatusIcon().

Test: Compile
Bug: 34838583
Change-Id: Id69da24de8269c0c7e31ea9ef3c595c3d69fe40e

7 years agoMerge "Moving the LoadedApk class to its own file."
Pierre Lecesne [Wed, 1 Feb 2017 05:30:14 +0000 (05:30 +0000)]
Merge "Moving the LoadedApk class to its own file."

7 years agoMerge "Enable SMS in carrier demo mode" into nyc-mr2-dev am: 42dfcc772b
Justin Klaassen [Wed, 1 Feb 2017 05:27:43 +0000 (05:27 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev am: 42dfcc772b
am: c21a98dee0

Change-Id: Ia21d10601651123326fba5944e39f52e42c7c746

7 years agoEnable SMS in carrier demo mode am: f8a10959d2
Justin Klaassen [Wed, 1 Feb 2017 05:26:37 +0000 (05:26 +0000)]
Enable SMS in carrier demo mode am: f8a10959d2
am: d9a1ed0cfb

Change-Id: I2ea950f526f3fbf4e4de7deae930de0a87180cc8

7 years agoMerge "Enable SMS in carrier demo mode" into nyc-mr2-dev
Justin Klaassen [Wed, 1 Feb 2017 05:21:01 +0000 (05:21 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev
am: 42dfcc772b

Change-Id: I8d36badab79c40e5a65a88ca4ed418409cd17e24

7 years agoEnable SMS in carrier demo mode
Justin Klaassen [Wed, 1 Feb 2017 05:20:56 +0000 (05:20 +0000)]
Enable SMS in carrier demo mode
am: f8a10959d2

Change-Id: Icc96ba3c6fafa5df0327297ed81f8c8dff8818fe

7 years agoMerge "Enable SMS in carrier demo mode" into nyc-mr2-dev
TreeHugger Robot [Wed, 1 Feb 2017 05:13:58 +0000 (05:13 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev

7 years agoMerge "Remove unnecessary Binder.clearCallingIdentity()"
TreeHugger Robot [Wed, 1 Feb 2017 05:10:28 +0000 (05:10 +0000)]
Merge "Remove unnecessary Binder.clearCallingIdentity()"

7 years agoMerge "Make sure start() is called for custom animators"
Doris Liu [Wed, 1 Feb 2017 04:33:25 +0000 (04:33 +0000)]
Merge "Make sure start() is called for custom animators"

7 years agoMerge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992f...
Peter Qiu [Wed, 1 Feb 2017 03:46:58 +0000 (03:46 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b am: ec61beaa7a
am: 3e6c9c9462

Change-Id: I1f345852ec2ea536e02caabd81818fa16d4c0dc7

7 years agoEnable SMS in carrier demo mode
Justin Klaassen [Wed, 1 Feb 2017 03:39:57 +0000 (19:39 -0800)]
Enable SMS in carrier demo mode

Fixes: 34861667
Test: manually verified default SMS app works in carrier demo mode.
Change-Id: Ic6f1065954e5bb54c6b78b3d604811333f6863e4

7 years agoMerge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08d...
Jeremy Joslin [Wed, 1 Feb 2017 03:39:57 +0000 (03:39 +0000)]
Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae am: 9c245a51f7
am: 499f1f39ff

Change-Id: I873b8c6239bb7766ac1a4b4078afb3700000186b

7 years agoMerge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191...
Peter Qiu [Wed, 1 Feb 2017 03:38:07 +0000 (03:38 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191 am: 28630218cc
am: ebafa7c813

Change-Id: I0bc0326e3ff67fff697f1aea004806978c4244b3

7 years agoMerge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992f...
Peter Qiu [Wed, 1 Feb 2017 03:37:58 +0000 (03:37 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b
am: ec61beaa7a

Change-Id: I26269af9bf18789ce40858df0645e17867f44469

7 years agoMerge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae
Jeremy Joslin [Wed, 1 Feb 2017 03:32:27 +0000 (03:32 +0000)]
Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae
am: 9c245a51f7

Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63

7 years agoMerge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191
Peter Qiu [Wed, 1 Feb 2017 03:30:58 +0000 (03:30 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191
am: 28630218cc

Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430

7 years agoMerge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad
Peter Qiu [Wed, 1 Feb 2017 03:30:51 +0000 (03:30 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad
am: 9e7725040b

Change-Id: I5b36bb042933a0a889b7f84281b174a7527ccaff

7 years agoMerge "Print the package name and creator UID in dump()." am: cf7f9dd6a1
Jeremy Joslin [Wed, 1 Feb 2017 03:25:47 +0000 (03:25 +0000)]
Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1
am: ba4bc08dae

Change-Id: I3f7e2a6ecdbe04fad0358fadecdeb8341baa99eb