OSDN Git Service

android-x86/frameworks-base.git
7 years agoAdd findPath method to MtpDocumentsProvider.
Daichi Hirono [Tue, 1 Nov 2016 09:41:43 +0000 (18:41 +0900)]
Add findPath method to MtpDocumentsProvider.

Bug: 32515515
Test: adb shell am instrument -w -e class com.android.mtp.MtpDocumentsProviderTest com.android.mtp.tests/com.android.mtp.TestResultInstrumentation
Change-Id: Ib87e8f5258de8fd48a099adbf077b3b9ff85773c

7 years agoMerge "PIP: Ignore TaskStackListener calls from another user"
Jaewan Kim [Tue, 1 Nov 2016 01:00:40 +0000 (01:00 +0000)]
Merge "PIP: Ignore TaskStackListener calls from another user"

7 years agoMerge "add libmedia as dependency of invoke_mock_media_player."
Wei Jia [Tue, 1 Nov 2016 00:39:15 +0000 (00:39 +0000)]
Merge "add libmedia as dependency of invoke_mock_media_player."

7 years agoPIP: Ignore TaskStackListener calls from another user
Jaewan Kim [Mon, 31 Oct 2016 04:55:43 +0000 (13:55 +0900)]
PIP: Ignore TaskStackListener calls from another user

Bug: 32533254
Change-Id: I0987c69ebbd33000b4d3cadb64e28a4c321bd486

7 years agoMerge "AmbientDisplay: Add always on prototype"
Adrian Roos [Mon, 31 Oct 2016 23:50:58 +0000 (23:50 +0000)]
Merge "AmbientDisplay: Add always on prototype"

7 years agoMerge "Public volumes belong to a single user."
TreeHugger Robot [Mon, 31 Oct 2016 22:10:59 +0000 (22:10 +0000)]
Merge "Public volumes belong to a single user."

7 years agoAmbientDisplay: Add always on prototype
Adrian Roos [Wed, 26 Oct 2016 19:51:26 +0000 (12:51 -0700)]
AmbientDisplay: Add always on prototype

Test: adb shell settings put secure doze_always_on 1
Change-Id: I3f293b3ef43847b7848af416b44f212fc40514d4

7 years agoMerge changes If8232b90,I3176837e
TreeHugger Robot [Mon, 31 Oct 2016 21:23:28 +0000 (21:23 +0000)]
Merge changes If8232b90,I3176837e

* changes:
  Deobfuscate computeFrameLw parameters.
  Begin series of computeFrame unit tests

7 years agoMerge "Fixing rebase problem."
Winson Chung [Mon, 31 Oct 2016 21:20:35 +0000 (21:20 +0000)]
Merge "Fixing rebase problem."

7 years agoFixing rebase problem.
Winson Chung [Mon, 31 Oct 2016 21:19:18 +0000 (14:19 -0700)]
Fixing rebase problem.

Test: Manual, Build fix.
Change-Id: Ibf72fea690f368220e76c5856a906bb1787ee000

7 years agoMerge "Introduced ReadOnlyWindowList"
TreeHugger Robot [Mon, 31 Oct 2016 21:15:43 +0000 (21:15 +0000)]
Merge "Introduced ReadOnlyWindowList"

7 years agoMerge "Creating PinnedStackController."
Winson Chung [Mon, 31 Oct 2016 21:12:45 +0000 (21:12 +0000)]
Merge "Creating PinnedStackController."

7 years agoMerge "Implement SkiaRecordingCanvas, RenderNodeDrawable and other drawables."
TreeHugger Robot [Mon, 31 Oct 2016 20:37:26 +0000 (20:37 +0000)]
Merge "Implement SkiaRecordingCanvas, RenderNodeDrawable and other drawables."

7 years agoPublic volumes belong to a single user.
Jeff Sharkey [Mon, 31 Oct 2016 20:33:49 +0000 (14:33 -0600)]
Public volumes belong to a single user.

When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.

To use the device under a different user, switch users and then
eject/remount the device.

Test: verified user isolation of USB drive
Bug: 32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614

7 years agoCreating PinnedStackController.
Winson Chung [Mon, 31 Oct 2016 20:14:28 +0000 (13:14 -0700)]
Creating PinnedStackController.

- Creating a PinnedStackController to keep track of the state of the PIP
  to prevent changes in the system (ie. IME showing) and user interaction
  from clobbering each other.
- Refactoring calls in AM into WM/controller

Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ie59dfd45d5c54764ba69a589b3b8148845e92cc3
Signed-off-by: Winson Chung <winsonc@google.com>
7 years agoMerge "DeviceInfoUtils: support clang kernel version"
TreeHugger Robot [Mon, 31 Oct 2016 20:19:29 +0000 (20:19 +0000)]
Merge "DeviceInfoUtils: support clang kernel version"

7 years agoMerge "Add @NonNull / @Nullable to DPM return types"
Makoto Onuki [Mon, 31 Oct 2016 20:15:05 +0000 (20:15 +0000)]
Merge "Add @NonNull / @Nullable to DPM return types"

7 years agoadd libmedia as dependency of invoke_mock_media_player.
Wei Jia [Mon, 31 Oct 2016 20:04:27 +0000 (13:04 -0700)]
add libmedia as dependency of invoke_mock_media_player.

Test: compiles
Bug: 32524218
Change-Id: I0dfa8d8fb69f0b48824452f362d5dfe877ad9ff8

7 years agoMerge "Add ephemeral protection level"
Chad Brubaker [Mon, 31 Oct 2016 20:02:48 +0000 (20:02 +0000)]
Merge "Add ephemeral protection level"

7 years agoDeobfuscate computeFrameLw parameters.
Robert Carr [Fri, 28 Oct 2016 20:15:04 +0000 (13:15 -0700)]
Deobfuscate computeFrameLw parameters.

I've always thought this added an extra barrier
to understanding an already confusing method.

Test: Just variable renaming.
Change-Id: If8232b9094c9d3487fa6c4443f5742ce75085772

7 years agoMerge "Allow specifying rotation animation in manifest."
Rob Carr [Mon, 31 Oct 2016 19:39:40 +0000 (19:39 +0000)]
Merge "Allow specifying rotation animation in manifest."

7 years agoMerge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13...
Sanket Agarwal [Mon, 31 Oct 2016 19:36:53 +0000 (19:36 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18 am: 9e33f453a3
am: 502e3e53ec

Change-Id: I8211babdceb7228c74232c15dfbc51d9f771d674

7 years agoMerge "Clean up InputConnection.commitContent() javadocs"
Chet Haase [Mon, 31 Oct 2016 19:34:47 +0000 (19:34 +0000)]
Merge "Clean up InputConnection.commitContent() javadocs"

7 years agoMerge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18
Sanket Agarwal [Mon, 31 Oct 2016 19:29:56 +0000 (19:29 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18
am: 9e33f453a3

Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c

7 years agoIntroduced ReadOnlyWindowList
Wale Ogunwale [Tue, 25 Oct 2016 22:25:14 +0000 (15:25 -0700)]
Introduced ReadOnlyWindowList

7th and Final step in making the modification of a display's
WindowList private to DisplayContent.
ReadOnlyWindowList provides an interface for external classes to
DisplayContent to access the window list without being able to
modify it. This will be important in upcoming CLs where it is
important for us to keep track of when the window list changes.

Bug: 30060889
Test: Manual testing and existing tests pass.

Change-Id: I4de0b258a40fd4b21ef9cc9e3401488f76d25f83

7 years agoMerge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
Sanket Agarwal [Mon, 31 Oct 2016 19:25:34 +0000 (19:25 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
am: 50cc13cc18

Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7

7 years agoMerge "Configuration for priority/auto-connection for PAN."
Sanket Agarwal [Mon, 31 Oct 2016 19:19:30 +0000 (19:19 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
am: ba63f32ed5

Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea

7 years agoMerge "Configuration for priority/auto-connection for PAN."
Sanket Agarwal [Mon, 31 Oct 2016 19:08:53 +0000 (19:08 +0000)]
Merge "Configuration for priority/auto-connection for PAN."

7 years agoMerge "Add new methods to ITaskStackListener"
Yorke Lee [Mon, 31 Oct 2016 19:04:59 +0000 (19:04 +0000)]
Merge "Add new methods to ITaskStackListener"

7 years agoresolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec am: 635d528877
Marie Janssen [Mon, 31 Oct 2016 19:00:50 +0000 (19:00 +0000)]
resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec am: 635d528877
am: 03836e31a9

Change-Id: Iefdedf47a91d398ca3c45656a4d73749acd03e6d

7 years agoresolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec
Marie Janssen [Mon, 31 Oct 2016 18:54:23 +0000 (18:54 +0000)]
resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec
am: 635d528877

Change-Id: I9a59aa4c657019ee06117591cb1a0bda4c67ea96

7 years agoresolve merge conflicts of 6a31a5c to stage-aosp-master
Marie Janssen [Mon, 31 Oct 2016 18:47:52 +0000 (18:47 +0000)]
resolve merge conflicts of 6a31a5c to stage-aosp-master
am: 879a5169ec

Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66

7 years agoDeviceInfoUtils: support clang kernel version
Nick Desaulniers [Sat, 29 Oct 2016 18:01:23 +0000 (11:01 -0700)]
DeviceInfoUtils: support clang kernel version

Test: view settings
Bug: 32455817
Change-Id: Iaaf8021fa743c74c8052b6a3352ef15b40cc4974

7 years agoAdd @NonNull / @Nullable to DPM return types
Makoto Onuki [Tue, 25 Oct 2016 19:10:27 +0000 (12:10 -0700)]
Add @NonNull / @Nullable to DPM return types

Fix: 31331663
Fix: 32466757

Test: Signature change only; checkbuild.
Change-Id: I361cdd43b9fccf309ff3efefa3783d5399e65748

7 years agoAdd ephemeral protection level
Chad Brubaker [Thu, 13 Oct 2016 22:44:59 +0000 (15:44 -0700)]
Add ephemeral protection level

Ephemeral applications will only be able to be granted permissions that
have the ephemeral proteciton level, this allows us to tighly define
what behavior is OK for ephemeral applications.

This includes an initial small whitelist of permissions for ephemeral
apps, it may be expanded later.

Test: adb install --ephemeral, verified against both runtime and install
time permissions
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: I854c44cf7a293d484b674cdd4fb5141e362a2f1a

7 years agoImplement SkiaRecordingCanvas, RenderNodeDrawable and other drawables.
Stan Iliev [Mon, 17 Oct 2016 20:26:15 +0000 (16:26 -0400)]
Implement SkiaRecordingCanvas, RenderNodeDrawable and other drawables.

Implement SkiaRecordingCanvas, RenderNodeDrawable, GLFunctorDrawable,
LayerDrawable, StartReorderBarrierDrawable, EndReorderBarrierDrawable.
Move AnimatedRoundRect and AnimatedCircle in a separate file.
All Skia pipeline files are moved in hwui/pipeline/skia folder.
Add unit tests for RenderNodeDrawable, StartReorderBarrierDrawable,
EndReorderBarrierDrawable and SkiaRecordingCanvas.

Test: I tested manually on 6P devices and did run the unit tests.
Change-Id: If2a347bd1fc4689953822294ce5bf98c7f3f57c7

7 years agoresolve merge conflicts of 6a31a5c to stage-aosp-master
Marie Janssen [Mon, 31 Oct 2016 18:00:06 +0000 (11:00 -0700)]
resolve merge conflicts of 6a31a5c to stage-aosp-master

Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194

7 years agoConfiguration for priority/auto-connection for PAN.
Sanket Agarwal [Thu, 4 Aug 2016 23:16:20 +0000 (16:16 -0700)]
Configuration for priority/auto-connection for PAN.

We protect the auto-connection via a flag so that it is only enabled on
some devices.

Bug: b/30679978
Change-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce
(cherry picked from commit 1f09d5f255980488cabd55a5c44a5737e24541d8)

7 years agoMerge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484 am: 3030cd855b
Brad Ebinger [Mon, 31 Oct 2016 17:28:21 +0000 (17:28 +0000)]
Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484 am: 3030cd855b
am: 10f8f2e95c

Change-Id: I722b4e6c012b96612ede2c1d8a932a3da4773b45

7 years agoMerge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484
Brad Ebinger [Mon, 31 Oct 2016 17:22:46 +0000 (17:22 +0000)]
Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0 am: 9e4d4ee484
am: 3030cd855b

Change-Id: I4d9b66c81f4f9fbebeacd9aede566f660c4b1bb8

7 years agoMerge "Define API for metering network stats buckets."
Stephen Chen [Mon, 31 Oct 2016 17:22:08 +0000 (17:22 +0000)]
Merge "Define API for metering network stats buckets."

7 years agoMerge "Bluetooth: prevent enabling BLE in airplane mode"
Treehugger Robot [Mon, 31 Oct 2016 17:20:39 +0000 (17:20 +0000)]
Merge "Bluetooth: prevent enabling BLE in airplane mode"

7 years agoMerge "Modify AIDLs to include Session.Info" am: 78a63c1cf0
Brad Ebinger [Mon, 31 Oct 2016 17:17:57 +0000 (17:17 +0000)]
Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0
am: 9e4d4ee484

Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20

7 years agoMerge "Remove the EXTRA_FANCY_FEATURES flag..."
Steve McKay [Mon, 31 Oct 2016 17:12:32 +0000 (17:12 +0000)]
Merge "Remove the EXTRA_FANCY_FEATURES flag..."

7 years agoMerge "Modify AIDLs to include Session.Info"
Brad Ebinger [Mon, 31 Oct 2016 17:12:26 +0000 (17:12 +0000)]
Merge "Modify AIDLs to include Session.Info"
am: 78a63c1cf0

Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552

7 years agoMerge "Modify AIDLs to include Session.Info"
Brad Ebinger [Mon, 31 Oct 2016 17:04:50 +0000 (17:04 +0000)]
Merge "Modify AIDLs to include Session.Info"

7 years agoBluetooth: prevent enabling BLE in airplane mode
Marie Janssen [Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)]
Bluetooth: prevent enabling BLE in airplane mode

Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.

Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.

Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble

Bug: 32140251
Bug: 32140271
Bug: 32369494

Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835

7 years agoClean up InputConnection.commitContent() javadocs
Chet Haase [Thu, 13 Oct 2016 22:49:09 +0000 (15:49 -0700)]
Clean up InputConnection.commitContent() javadocs

Test: docs only, no test apart from verifying that it builds
Bug: #32158219 clean up InputConnection.commitContent() javadocs
Change-Id: I94ca33a34dfaece8db912367d2290db67a4a038a

7 years agoUpdate colors for the round scroll bar. am: 5177264735 am: c78b695126
Aga Madurska [Mon, 31 Oct 2016 12:05:28 +0000 (12:05 +0000)]
Update colors for the round scroll bar. am: 5177264735 am: c78b695126
am: 5a5187edcd

Change-Id: I08861d4c80ba2d682ed009c82bec1933d8f78c09

7 years agoUpdate colors for the round scroll bar. am: 5177264735
Aga Madurska [Mon, 31 Oct 2016 11:59:29 +0000 (11:59 +0000)]
Update colors for the round scroll bar. am: 5177264735
am: c78b695126

Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5

7 years agoUpdate colors for the round scroll bar.
Aga Madurska [Mon, 31 Oct 2016 11:53:51 +0000 (11:53 +0000)]
Update colors for the round scroll bar.
am: 5177264735

Change-Id: I576d9149292cc23ac72a734d5ac3986d199f7db8

7 years agoMerge "Allow DO to remove user even if DISALLOW_REMOVE_USER is set."
Nicolas Prévot [Mon, 31 Oct 2016 11:23:23 +0000 (11:23 +0000)]
Merge "Allow DO to remove user even if DISALLOW_REMOVE_USER is set."

7 years agoUpdate colors for the round scroll bar.
Aga Madurska [Mon, 31 Oct 2016 10:33:27 +0000 (10:33 +0000)]
Update colors for the round scroll bar.

Bug:32536003

Change-Id: I35503c089bc918493aab3288580f81d7b780d671

7 years agoMerge "Add support for opening JAR/ZIP files via FD."
Tomasz Mikolajewski [Mon, 31 Oct 2016 05:55:51 +0000 (05:55 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."

7 years agoMerge changes from topic 'frameworks-net-tests'
Lorenzo Colitti [Mon, 31 Oct 2016 04:16:48 +0000 (04:16 +0000)]
Merge changes from topic 'frameworks-net-tests'

* changes:
  Move the connectivity tests to frameworks/base/tests/net.
  De-guava BroadcastInterceptingContext and move it to testutils.
  Move FakeSettingsProvider to a common location.

7 years agoMerge "Iteration on findPath API. Address Jeff's comment in ag/1542773."
TreeHugger Robot [Sat, 29 Oct 2016 01:36:13 +0000 (01:36 +0000)]
Merge "Iteration on findPath API. Address Jeff's comment in ag/1542773."

7 years agoRemove the EXTRA_FANCY_FEATURES flag...
Steve McKay [Fri, 28 Oct 2016 23:51:54 +0000 (16:51 -0700)]
Remove the EXTRA_FANCY_FEATURES flag...

Which is no-longer necessary.

Test: build and run.

Change-Id: I515c4a1bf78cbf4d54304bf4ebe1059a596c95a0

7 years agoMerge "Power manager now prevents wake locks from idle uids."
Dianne Hackborn [Fri, 28 Oct 2016 23:53:31 +0000 (23:53 +0000)]
Merge "Power manager now prevents wake locks from idle uids."

7 years agoMerge "Add FragmentLifecycleCallbacks"
TreeHugger Robot [Fri, 28 Oct 2016 23:53:19 +0000 (23:53 +0000)]
Merge "Add FragmentLifecycleCallbacks"

7 years agoIteration on findPath API. Address Jeff's comment in ag/1542773.
Garfield Tan [Wed, 26 Oct 2016 21:52:46 +0000 (14:52 -0700)]
Iteration on findPath API. Address Jeff's comment in ag/1542773.

* Add @Nullable to rootId in Path constructor.
* Erase rootId if findPath() doesn't return null rootId.
* Use Log.wtf() instead of throwing.

Bug: 30948740
Change-Id: I38354c5ac49aaa7e31a3ae56cd3379ffb19918c9
(Cherry picked from commit 04fdf6e18c97c2bf6ed58f8de9ba6723fa8c1613)

7 years agoAdd FragmentLifecycleCallbacks
Adam Powell [Fri, 28 Oct 2016 17:24:40 +0000 (10:24 -0700)]
Add FragmentLifecycleCallbacks

Add a new callback object that can be attached to a FragmentManager to
observe all fragment lifecycle events within that
FragmentManager. Useful for dependency injection and other
shenanigans.

FragmentLifecycleCallbacks can be registered as recursive, in which
case they will be activated for any lifecycle events that happen in
descendant FragmentManagers as well.

Test: cts-tradefed run singleCommand cts --skip-preconditions --skip-device-info --module CtsFragmentTestCases
Change-Id: I816b1fbef6c29616ccc3fd729ee847c5f1a6f72f

7 years agoAdd new methods to ITaskStackListener
Yorke Lee [Tue, 25 Oct 2016 20:49:23 +0000 (13:49 -0700)]
Add new methods to ITaskStackListener

Refactor task change notification logic into a separate class
TaskChangeNotificationController.

Add ActivityManagerService.unregisterTaskStackChangedListener

Add a no-op implementation that clients can subclass to avoid
having to reimplement all new methods when they are added.

Add new methods:
onTaskAdded
onTaskRemoved
onTaskMovedToFront
onTaskDescriptionChanged
onActivityRequestedOrientationChanged
onTaskFinishing

Design doc:
https://docs.google.com/document/d/1IgWZ44rKe9k1CzkjP2Mohv12OgRD1FxH8oLAyzhvCY4/edit#heading=h.yhzl6os0dbo5

Cherry-picked from I8302d6d3baf1ac1ca928765fe203091b9fab4070

Bug: 32277482
Test: Verify that callbacks are called in dummy implementations

Change-Id: I2ac2b870147ef049f3ee05fc5916c99332334526

7 years agoMerge "Add windows to window tokens in expected z-order"
TreeHugger Robot [Fri, 28 Oct 2016 21:52:14 +0000 (21:52 +0000)]
Merge "Add windows to window tokens in expected z-order"

7 years agoMerge "vibrator: Remove unused using statement."
TreeHugger Robot [Fri, 28 Oct 2016 21:36:01 +0000 (21:36 +0000)]
Merge "vibrator: Remove unused using statement."

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958da...
Sanket Agarwal [Fri, 28 Oct 2016 20:49:57 +0000 (20:49 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958dab93cd am: 9527a19cbc
am: 6b2b2a87f9

Change-Id: I48705f864b31912538bfc8fdd6ca3749c11becb7

7 years agoMerge "Modify AIDLs to include Session.Info" into stage-aosp-master am: aacbdf59d6...
Brad Ebinger [Fri, 28 Oct 2016 20:37:18 +0000 (20:37 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am: aacbdf59d6 am: ccd8315969
am: 5cf582e74d

Change-Id: I348de54b56282d3a88e03671e2816425b953972b

7 years agoModify AIDLs to include Session.Info am: b32d4f8b5c am: 668a6fa227
Brad Ebinger [Fri, 28 Oct 2016 20:36:01 +0000 (20:36 +0000)]
Modify AIDLs to include Session.Info am: b32d4f8b5c am: 668a6fa227
am: e3f387fe3a

Change-Id: Ief110680037a71d2385fa46c33983887104b4caf

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958da...
Sanket Agarwal [Fri, 28 Oct 2016 20:28:50 +0000 (20:28 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958dab93cd
am: 9527a19cbc

Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad

7 years agoMerge "Modify AIDLs to include Session.Info" into stage-aosp-master am: aacbdf59d6
Brad Ebinger [Fri, 28 Oct 2016 20:26:51 +0000 (20:26 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am: aacbdf59d6
am: ccd8315969

Change-Id: If1e6819430977bf3978bbbf23f0f32fcb1c460d4

7 years agoModify AIDLs to include Session.Info am: b32d4f8b5c
Brad Ebinger [Fri, 28 Oct 2016 20:25:34 +0000 (20:25 +0000)]
Modify AIDLs to include Session.Info am: b32d4f8b5c
am: 668a6fa227

Change-Id: I7afb3692f4f26c37b96c98d7a1e173576dd7620b

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533
Sanket Agarwal [Fri, 28 Oct 2016 20:19:14 +0000 (20:19 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533
am: 958dab93cd

Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1

7 years agoMerge "Refactor mock Functors into a common TestUtils class."
Derek Sollenberger [Fri, 28 Oct 2016 20:17:53 +0000 (20:17 +0000)]
Merge "Refactor mock Functors into a common TestUtils class."

7 years agoMerge "Modify AIDLs to include Session.Info" into stage-aosp-master
Brad Ebinger [Fri, 28 Oct 2016 20:17:15 +0000 (20:17 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am: aacbdf59d6

Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934

7 years agoModify AIDLs to include Session.Info
Brad Ebinger [Fri, 28 Oct 2016 20:17:03 +0000 (20:17 +0000)]
Modify AIDLs to include Session.Info
am: b32d4f8b5c

Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)"
Sanket Agarwal [Fri, 28 Oct 2016 20:13:57 +0000 (20:13 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
am: 678ba24533

Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237

7 years agoBegin series of computeFrame unit tests
Robert Carr [Fri, 28 Oct 2016 18:45:22 +0000 (11:45 -0700)]
Begin series of computeFrame unit tests

Start with a fixture and some simple unit tests
for WindowState.computeFrame.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowFrameTests
Change-Id: I3176837ee60dbd474f22a3b1857f19b4e82afee7

7 years agoMerge "Modify AIDLs to include Session.Info" into stage-aosp-master
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)"
Sanket Agarwal [Fri, 28 Oct 2016 20:01:58 +0000 (20:01 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"

7 years agoAdd windows to window tokens in expected z-order
Wale Ogunwale [Fri, 14 Oct 2016 22:30:09 +0000 (15:30 -0700)]
Add windows to window tokens in expected z-order

Decouple the logic for adding window to a position in the parent
window token from the position we are adding the window to in the
window list. The window token now adds the windows in order based
on the rules the rest of the system is using which makes the code
a little more straightforward to follow.

Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Change-Id: Ic9b724fba02279a0c4e92508d39e5e35171b6d8d

7 years agoMerge "Add SurfaceHolder#lockHardwareCanvas()"
John Reck [Fri, 28 Oct 2016 19:38:42 +0000 (19:38 +0000)]
Merge "Add SurfaceHolder#lockHardwareCanvas()"

7 years agovibrator: Remove unused using statement.
Steven Moreland [Fri, 28 Oct 2016 19:29:43 +0000 (12:29 -0700)]
vibrator: Remove unused using statement.

Bug: 32313592
Test: compiles
Change-Id: Ia2b99bd0a28653daa61150da022024e21a02a842

7 years agoModify AIDLs to include Session.Info
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
Modify AIDLs to include Session.Info

Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b

7 years agoMerge "AAPT2: Insert <uses-sdk> element before <application>"
Adam Lesinski [Fri, 28 Oct 2016 18:50:49 +0000 (18:50 +0000)]
Merge "AAPT2: Insert <uses-sdk> element before <application>"

7 years agoAllow DO to remove user even if DISALLOW_REMOVE_USER is set.
Nicolas Prevot [Tue, 25 Oct 2016 12:57:08 +0000 (13:57 +0100)]
Allow DO to remove user even if DISALLOW_REMOVE_USER is set.

BUG:32300784
Test: create user in TestDPC, set DISALLOW_REMOVE_USER restriction,
and remove this user.
Change-Id: I96ab02d594cd1a8ab14420e12357f2083da1ce63

7 years agoPower manager now prevents wake locks from idle uids.
Dianne Hackborn [Wed, 26 Oct 2016 00:13:24 +0000 (17:13 -0700)]
Power manager now prevents wake locks from idle uids.

The activity manager now pushes the idle/active state
down in to the power manager.  The power manager now
tracks a structure of data about each uid: how many
wake locks it holds, whether it is active, and (as before)
its current process state.

Now when apps are inactive, we always disable wake locks
they hold, regardless of the system's device idle or
other state.

Test: none

Change-Id: I2cd4077e4d8a8572525406ae9747f0a2435764da

7 years agoUse UUIDs for call management in Headset Client (HF)
Sanket Agarwal [Tue, 28 Jun 2016 03:13:54 +0000 (20:13 -0700)]
Use UUIDs for call management in Headset Client (HF)

Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit 40bb6f3f8fc02600fe24301c11e804196ced3531)

7 years agoMerge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d...
Igor Murashkin [Fri, 28 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d am: 4aa38633fe
am: 7ab062fd66

Change-Id: I6d093ad8aa1b04d75e6968ebcb9c0fb7376f0811

7 years agoMerge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d
Igor Murashkin [Fri, 28 Oct 2016 18:00:11 +0000 (18:00 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d
am: 4aa38633fe

Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3

7 years agoRefactor mock Functors into a common TestUtils class.
Derek Sollenberger [Fri, 28 Oct 2016 17:57:14 +0000 (13:57 -0400)]
Refactor mock Functors into a common TestUtils class.

Test: refactor. existing tests still pass
Change-Id: I55258487c371869a5b91dd2dcf6bf7bd47ac1a35

7 years agoMerge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555
Igor Murashkin [Fri, 28 Oct 2016 17:55:12 +0000 (17:55 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555
am: d0d99d8a3d

Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516

7 years agoMerge "app_process: Forward -cp/-classpath to ART."
Igor Murashkin [Fri, 28 Oct 2016 17:48:15 +0000 (17:48 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
am: 4a4a8f1555

Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747

7 years agoMerge changes I8673cb95,I2f2a461b
TreeHugger Robot [Fri, 28 Oct 2016 17:38:22 +0000 (17:38 +0000)]
Merge changes I8673cb95,I2f2a461b

* changes:
  Make plugins have an application context
  Add system property to not disable plugins on crash

7 years agoMerge "app_process: Forward -cp/-classpath to ART."
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."

7 years agoMerge changes If99865cd,I5b794c94
Derek Sollenberger [Fri, 28 Oct 2016 17:13:18 +0000 (17:13 +0000)]
Merge changes If99865cd,I5b794c94

* changes:
  Fix test breakage due to naming collision in the linker.
  Minor cleanup of unused headers and overly described functions.

7 years agoMerge "Provisioning constants"
TreeHugger Robot [Fri, 28 Oct 2016 16:16:01 +0000 (16:16 +0000)]
Merge "Provisioning constants"

7 years agoMerge "Remove ApplicationThreadNative from preloaded/compiled-classes."
Sudheer Shanka [Fri, 28 Oct 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Remove ApplicationThreadNative from preloaded/compiled-classes."

7 years agoFix test breakage due to naming collision in the linker.
Derek Sollenberger [Fri, 28 Oct 2016 15:08:50 +0000 (11:08 -0400)]
Fix test breakage due to naming collision in the linker.

Test: hwui_unit_tests in question now run successfully.
Change-Id: If99865cd1cfa5c819338d062f5685700380a60a6

7 years agoMinor cleanup of unused headers and overly described functions.
Derek Sollenberger [Wed, 26 Oct 2016 16:05:24 +0000 (12:05 -0400)]
Minor cleanup of unused headers and overly described functions.

Test: local compile
Change-Id: I5b794c9473f6d3a9e1d4f9365c951c7ce9dade50

7 years agoMake plugins have an application context
Jason Monk [Wed, 26 Oct 2016 19:23:09 +0000 (15:23 -0400)]
Make plugins have an application context

So things that use them don't crash.

Test: Plugin that uses getApplicationContext
Change-Id: I8673cb95544280f593479b014cd2620c2d02bf80

7 years agoAdd system property to not disable plugins on crash
Jason Monk [Wed, 26 Oct 2016 19:12:23 +0000 (15:12 -0400)]
Add system property to not disable plugins on crash

Should be used only during dev to avoid having to turn crashing
plugins back on constantly.

Test: Manual
Change-Id: I2f2a461bf7aef017781ed3b61fcb216d7e1cbae9