OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Revert "Revert "Logging: Bluetooth Enabled""" am: 827a150646
Tej Singh [Fri, 23 Mar 2018 19:06:02 +0000 (19:06 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled""" am: 827a150646
am: 428e05ac6c

Change-Id: I54932a1b45870a75450a605584f09b797a9f2298

6 years agoMerge "Fix resource by name lookup" into pi-dev
Svet Ganov [Fri, 23 Mar 2018 19:00:33 +0000 (19:00 +0000)]
Merge "Fix resource by name lookup" into pi-dev
am: 909402935c

Change-Id: I6eadfe944f1f2893deb8f9fc6d72e6e3c7171d5e

6 years agoMerge "Revert "Revert "Logging: Bluetooth Enabled"""
Tej Singh [Fri, 23 Mar 2018 18:57:43 +0000 (18:57 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
am: 827a150646

Change-Id: I38a7a8e0124b14d394db96b61d2ac6ceacf4bdb9

6 years agoMerge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
Petr Cermak [Fri, 23 Mar 2018 18:55:42 +0000 (18:55 +0000)]
Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
am: 4341a66b03

Change-Id: I0d1a41c52cfe2b24eaa23cbd8fc49a6ae6493c2f

6 years agoMerge "Fix statsd dropping metrics data." into pi-dev
David Chen [Fri, 23 Mar 2018 18:50:20 +0000 (18:50 +0000)]
Merge "Fix statsd dropping metrics data." into pi-dev
am: dc2dda5c49

Change-Id: I83ef6b23ecd0083658f011c5248e0c6cfe9bec92

6 years agoMerge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev
Mihai Popa [Fri, 23 Mar 2018 18:44:38 +0000 (18:44 +0000)]
Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev
am: 14372aaabc

Change-Id: I809c725f2bc11929047a7047b4b24a7edbc1260b

6 years agoMerge "Whitelist com.android.perftests.core in am instrument." into pi-dev
David Brazdil [Fri, 23 Mar 2018 18:37:13 +0000 (18:37 +0000)]
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
am: 600f3bb4fb

Change-Id: I6fba00155940fe5172be84254af1ce5cc077ac4a

6 years agoMerge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey...
Dmitry Dementyev [Fri, 23 Mar 2018 18:31:59 +0000 (18:31 +0000)]
Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev
am: 95f2965a74

Change-Id: I2e44ca18a1f3fa928f3a3529a1425a483dd34d06

6 years agoMerge changes from topic "bug73953366_bug74605221" into pi-dev
Emilian Peev [Fri, 23 Mar 2018 18:20:08 +0000 (18:20 +0000)]
Merge changes from topic "bug73953366_bug74605221" into pi-dev
am: 7ed5fb3e1d

Change-Id: I5d435b2c2edfeaaca0e12f1af222680f71dad2fc

6 years agoCamera: Camera shouldn't throw 'RejectedExecutionException'
Emilian Peev [Fri, 23 Mar 2018 18:15:35 +0000 (18:15 +0000)]
Camera: Camera shouldn't throw 'RejectedExecutionException'
am: b9a5194e9e

Change-Id: Ic4dd87d89f91822fce82c5ca27632f69716279e5

6 years agoRevert "Revert "Camera: SessionConfiguration should use Executors""
Emilian Peev [Fri, 23 Mar 2018 18:11:10 +0000 (18:11 +0000)]
Revert "Revert "Camera: SessionConfiguration should use Executors""
am: 77ca866b53

Change-Id: I226e1ba33047695b74ce5de9054c4760e61bf773

6 years agoMerge "Fix resource by name lookup" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:51:24 +0000 (17:51 +0000)]
Merge "Fix resource by name lookup" into pi-dev

6 years agoMerge "Clear the frame buffer for F16 pixel format" into pi-dev
Stan Iliev [Fri, 23 Mar 2018 17:47:35 +0000 (17:47 +0000)]
Merge "Clear the frame buffer for F16 pixel format" into pi-dev
am: 13269764e5

Change-Id: I95a5645e16a9431a57be6b23dcd9c95075957aac

6 years agoMerge "Remove 17 bytes length restriction for vaultHandler." into pi-dev
Dmitry Dementyev [Fri, 23 Mar 2018 17:43:59 +0000 (17:43 +0000)]
Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev
am: d9e1a8fd68

Change-Id: Ia02500da76876aae8649f40812a5d3451ad49459

6 years agoMerge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:40:56 +0000 (17:40 +0000)]
Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev

6 years agoMerge "Fix statsd dropping metrics data." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:40:18 +0000 (17:40 +0000)]
Merge "Fix statsd dropping metrics data." into pi-dev

6 years agoMerge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev
Mihai Popa [Fri, 23 Mar 2018 17:39:04 +0000 (17:39 +0000)]
Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev

6 years agoMerge "Whitelist com.android.perftests.core in am instrument." into pi-dev
David Brazdil [Fri, 23 Mar 2018 17:34:19 +0000 (17:34 +0000)]
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev

6 years agoMerge "Revert "Revert "Logging: Bluetooth Enabled"""
Treehugger Robot [Fri, 23 Mar 2018 17:29:36 +0000 (17:29 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""

6 years agoMerge "Update RecoverableKeyStoreManager methods to throw NullPointerException when...
Dmitry Dementyev [Fri, 23 Mar 2018 17:22:26 +0000 (17:22 +0000)]
Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev
am: 364dbf1c9e

Change-Id: I6ad01aa0dace567c6c6da67435213bbe8a9e63f3

6 years agoMerge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
Leif Hendrik Wilden [Fri, 23 Mar 2018 17:16:24 +0000 (17:16 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
am: f3f86dd09e

Change-Id: I4e6b2ea56e3e97fe8bc15424decd19e26085e5f0

6 years agoMerge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey...
Dmitry Dementyev [Fri, 23 Mar 2018 17:16:17 +0000 (17:16 +0000)]
Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev

6 years agoMerge changes from topic "bug73953366_bug74605221" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:16:00 +0000 (17:16 +0000)]
Merge changes from topic "bug73953366_bug74605221" into pi-dev

* changes:
  Camera: Complete transition from handlers to executors
  Camera: Camera shouldn't throw 'RejectedExecutionException'
  Revert "Revert "Camera: SessionConfiguration should use Executors""

6 years agoMerge "Clear the frame buffer for F16 pixel format" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:14:01 +0000 (17:14 +0000)]
Merge "Clear the frame buffer for F16 pixel format" into pi-dev

6 years agoMerge "Remove 17 bytes length restriction for vaultHandler." into pi-dev
Dmitry Dementyev [Fri, 23 Mar 2018 17:08:48 +0000 (17:08 +0000)]
Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev

6 years agoMerge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into...
Jakub Pawlowski [Fri, 23 Mar 2018 17:08:45 +0000 (17:08 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev
am: 85e7716a14

Change-Id: I6a8a88054bf115b1d02139c988f8ca062795d055

6 years agoMerge "Update RecoverableKeyStoreManager methods to throw NullPointerException when...
Dmitry Dementyev [Fri, 23 Mar 2018 17:06:18 +0000 (17:06 +0000)]
Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev

6 years agoMerge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:06:02 +0000 (17:06 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev

6 years agoMerge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into...
TreeHugger Robot [Fri, 23 Mar 2018 16:56:31 +0000 (16:56 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev

6 years agoMerge "resolve merge conflicts of daef557352934e5a6e20a45bd2a01c832f657e42 to pi...
Mathew Inwood [Fri, 23 Mar 2018 16:48:11 +0000 (16:48 +0000)]
Merge "resolve merge conflicts of daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp" into pi-dev-plus-aosp

6 years agoresolve merge conflicts of daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus...
Mathew Inwood [Fri, 23 Mar 2018 15:58:52 +0000 (15:58 +0000)]
resolve merge conflicts of daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Change-Id: I3d1aeb30b755ca05f32dcd3c46335d1611e0bb50

6 years agoMerge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
Ricky Wai [Fri, 23 Mar 2018 16:19:46 +0000 (16:19 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
am: 651ac4d119

Change-Id: Ie468743be5b369e49eacda9707e76e010639a7fe

6 years agoMerge "Add hidden API on light greylist" into pi-dev
David Brazdil [Fri, 23 Mar 2018 16:05:41 +0000 (16:05 +0000)]
Merge "Add hidden API on light greylist" into pi-dev
am: a63484c0d6

Change-Id: Ibb80e612711777dfecf3c0b0385a3573924acda4

6 years agoMerge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
Ricky Wai [Fri, 23 Mar 2018 15:55:28 +0000 (15:55 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev

6 years agoAnnotate RemoteInput#SOURCE_* with @IntDef
Petr Cermak [Fri, 16 Mar 2018 10:23:00 +0000 (10:23 +0000)]
Annotate RemoteInput#SOURCE_* with @IntDef

This patch addresses a request from the API Council (http://b/74409378).
It defines a new RemoteInput.Source annotation for RemoteInput source
constants.

Bug: 74409378
Test: atest RemoteInputTest
Change-Id: I78a006b6a600ea0c0603b2591d1a29596074a44e

6 years agoMerge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
Ralph Nathan [Fri, 23 Mar 2018 15:49:05 +0000 (15:49 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
am: 4a94e42bed

Change-Id: I02a0a70021875cc2efbda56bd71e91136acf4519

6 years agoMerge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
Bo Zhu [Fri, 23 Mar 2018 15:44:56 +0000 (15:44 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
am: 9ec7026e92

Change-Id: I0026b0ef43e9918811591f416a370dff84254df4

6 years agoMerge "Add hidden API on light greylist" into pi-dev
David Brazdil [Fri, 23 Mar 2018 15:41:11 +0000 (15:41 +0000)]
Merge "Add hidden API on light greylist" into pi-dev

6 years agoMerge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
Ralph Nathan [Fri, 23 Mar 2018 15:26:55 +0000 (15:26 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev

6 years agoMerge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
Bo Zhu [Fri, 23 Mar 2018 15:25:36 +0000 (15:25 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev

6 years agoWhitelist com.android.perftests.core in am instrument.
Nicolas Geoffray [Fri, 23 Mar 2018 15:00:50 +0000 (15:00 +0000)]
Whitelist com.android.perftests.core in am instrument.

Test is using private APIs.

Bug: 64382372
Bug: 74963051
Bug: 76162083
Test: make
Change-Id: I053b89327944e3722f2c11a9bc83ed1676fa9f85

6 years agoMerge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
arangelov [Fri, 23 Mar 2018 15:18:53 +0000 (15:18 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
am: 3384343629

Change-Id: Ia9a8fb3b04b39327b96c6b219d1e3d61e636980e

6 years agoMerge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 15:05:14 +0000 (15:05 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev

6 years agoMerge "More flexible API enforcement policy."
Mathew Inwood [Fri, 23 Mar 2018 15:02:12 +0000 (15:02 +0000)]
Merge "More flexible API enforcement policy."
am: 69e1cbc3fe

Change-Id: I8b54dcbca3991b2b076e0648e3948c80d74351d3

6 years agoMerge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotat...
Adrian Roos [Fri, 23 Mar 2018 14:55:13 +0000 (14:55 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev
am: 5ee32ac1af

Change-Id: Ia811a4d2aa47a41aa4a97d04ac4dcd7b562b48f4

6 years agoClear the frame buffer for F16 pixel format
Stan Iliev [Fri, 23 Mar 2018 14:50:11 +0000 (10:50 -0400)]
Clear the frame buffer for F16 pixel format

This is a workaround for Qualcomm bug and should be reverted
after a proper fixed is found.

Bug: 74976293
Test: Ran Photo app
Change-Id: I9e0a4634f02c3553635f058eb588b510a63273ba

6 years agoMerge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotat...
TreeHugger Robot [Fri, 23 Mar 2018 14:45:44 +0000 (14:45 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev

6 years agoMerge "Deprecating unused fields from GnssMeasurement" into pi-dev
Wyatt Riley [Fri, 23 Mar 2018 13:50:08 +0000 (13:50 +0000)]
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev
am: a106a1a6b4

Change-Id: I26e0c6849773447cf29c388b2801a221264966bd

6 years agoMerge "Deprecating unused fields from GnssMeasurement" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 13:41:46 +0000 (13:41 +0000)]
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev

6 years agoAdd hidden API on light greylist
David Brazdil [Fri, 23 Mar 2018 13:39:32 +0000 (13:39 +0000)]
Add hidden API on light greylist

Used by a CTS test

Bug: 64382372
Bug: 76166763
Bug: 76117220
Test: atest CtsActivityManagerDeviceTestCases:DisplaySizeTest
Change-Id: I37ccb7bc820e467d1cc5fd7f3c0dc696b466ff32

6 years ago[automerger skipped]Merge "Fix mini-debug-info generation for apps with wrap.sh scrip...
David Srbecky [Fri, 23 Mar 2018 13:36:04 +0000 (13:36 +0000)]
[automerger skipped]Merge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev
am: 6ae5d863de  -s ours

Change-Id: I2795f7e629b3f92afe1c012f331b6e868530c89d

6 years agoMerge "More flexible API enforcement policy."
Mathew Inwood [Fri, 23 Mar 2018 13:29:03 +0000 (13:29 +0000)]
Merge "More flexible API enforcement policy."

6 years agoMerge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev
David Srbecky [Fri, 23 Mar 2018 13:27:21 +0000 (13:27 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev

6 years agoMerge "Hide user switcher from QS on phones." into pi-dev
Amin Shaikh [Fri, 23 Mar 2018 13:22:01 +0000 (13:22 +0000)]
Merge "Hide user switcher from QS on phones." into pi-dev
am: cfa0bc22ee

Change-Id: I0e6ec7529bba4189970e47a511dbbbcf39a9d5c1

6 years agoMerge "Add 1dp between mobile type and signal icons." into pi-dev
Amin Shaikh [Fri, 23 Mar 2018 13:17:10 +0000 (13:17 +0000)]
Merge "Add 1dp between mobile type and signal icons." into pi-dev
am: 573a757b0c

Change-Id: I9557410be49bb873d4fbd70dea9e47c9ad541b1e

6 years agoMerge "Hide user switcher from QS on phones." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 13:09:30 +0000 (13:09 +0000)]
Merge "Hide user switcher from QS on phones." into pi-dev

6 years agoMerge "Add 1dp between mobile type and signal icons." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 13:08:28 +0000 (13:08 +0000)]
Merge "Add 1dp between mobile type and signal icons." into pi-dev

6 years agoMerge "Add new key from Settings.java to settings.proto." into pi-dev
Anthony Stange [Fri, 23 Mar 2018 13:03:40 +0000 (13:03 +0000)]
Merge "Add new key from Settings.java to settings.proto." into pi-dev
am: e08a6aa804

Change-Id: Ic801aa98c7511be5e005b71bd1b37e0de687b303

6 years agoMerge "Add new key from Settings.java to settings.proto." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 12:54:28 +0000 (12:54 +0000)]
Merge "Add new key from Settings.java to settings.proto." into pi-dev

6 years agoDisplayCutout: do not animate cutout (and rounded corner) overlay during rotation
Adrian Roos [Wed, 21 Mar 2018 18:52:09 +0000 (19:52 +0100)]
DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation

Moves the rounded corner overlay to the overlay layer to prevent it
from getting rotated, since physical features of the display cannot
rotate.

Note that they are still below the screenshot, so not visible during
the transition (because the buffers are not synchronized to the rotation
properly yet).

Also makes sure that only priviliged processes can do this, because the
overlay layer can obscure SystemUI.

Bug: 76102595
Test: Enable cutouts, rotate screen, verify cutout overlay does not participate in the animation
Change-Id: I65dd0bc5b038cca2ba4265c7e7dc93f3264c4d89

6 years agoMerge "Fix NPE when animation doesn't get started" into pi-dev
Jorim Jaggi [Fri, 23 Mar 2018 12:23:58 +0000 (12:23 +0000)]
Merge "Fix NPE when animation doesn't get started" into pi-dev
am: 8b881b29bf

Change-Id: I78bbbfbac2bf9249be3509ac0021d5f869c89f7b

6 years agoMerge "Fix mini-debug-info generation for apps with wrap.sh script." am: 5c3521d54f
David Srbecky [Fri, 23 Mar 2018 12:17:32 +0000 (12:17 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script." am: 5c3521d54f
am: 5a0a33a8fb

Change-Id: I39f465a4f6b7cef73217d353a0d6d301298e29d4

6 years agoMerge "Fix NPE when animation doesn't get started" into pi-dev
Jorim Jaggi [Fri, 23 Mar 2018 12:11:19 +0000 (12:11 +0000)]
Merge "Fix NPE when animation doesn't get started" into pi-dev

6 years agoMerge "Fix mini-debug-info generation for apps with wrap.sh script."
David Srbecky [Fri, 23 Mar 2018 12:10:41 +0000 (12:10 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."
am: 5c3521d54f

Change-Id: I22f7893925d2d774cc3e3f10287fb54ae1acf0e1

6 years agoMore flexible API enforcement policy.
Mathew Inwood [Fri, 23 Mar 2018 10:05:01 +0000 (10:05 +0000)]
More flexible API enforcement policy.

This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.

PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.

(cherry-picked from commit e52130ae4cf3b046b38a09fc7cc7712f5b7fb83d)

Test: m
Test: Boot device

BUG: 73337509
Change-Id: Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262

6 years agoMerge "detect api version, and start respecting offsets" into pi-dev
Mike Reed [Fri, 23 Mar 2018 11:41:16 +0000 (11:41 +0000)]
Merge "detect api version, and start respecting offsets" into pi-dev
am: dfdc379144

Change-Id: I92000b3131857c97f155a0e92811e113b6b406fc

6 years ago[Magnifier-34] Keep magnifier inside its surface
Mihai Popa [Wed, 21 Mar 2018 18:05:13 +0000 (18:05 +0000)]
[Magnifier-34] Keep magnifier inside its surface

Before this CL, the magnifier window was sometimes displayed partially
out of screen or overlapping with the system bar. This CL prevents this
issue by clamping the magnifier inside its parent surface, also taking
into account the system window insets of this surface.

Also, the CL fixes two kindof unrelated small bugs:
- remembers to reset the previous show and pixel copy coordinates on
  #dismiss()
- when clamping the pixel copy coordinates inside surface, consider the
  size of the copied content rather than the size of the window where
  this is scaled and then copied

Bug: 74234779
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Iec3404123145aa95b37c88f4fbfa3918cbf24f9d

6 years agoMerge "Delete unimplemented APIs from RecoveryController." into pi-dev
Aseem Kumar [Fri, 23 Mar 2018 11:31:14 +0000 (11:31 +0000)]
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev
am: 0ed26bc8b1

Change-Id: I7f5abe06978db5f421bfd831ead6e2bc0ebe4cee

6 years agoMerge "detect api version, and start respecting offsets" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 11:25:19 +0000 (11:25 +0000)]
Merge "detect api version, and start respecting offsets" into pi-dev

6 years agoMerge "Delete unimplemented APIs from RecoveryController." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 11:19:06 +0000 (11:19 +0000)]
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev

6 years agoAdd new key from Settings.java to settings.proto.
Anthony Stange [Wed, 21 Mar 2018 15:04:09 +0000 (15:04 +0000)]
Add new key from Settings.java to settings.proto.

Bug: 71765044
Test: Presubmits

Change-Id: I28f19791e26a07c9bf6846bbf99c774682cdf18f

6 years agoFix mini-debug-info generation for apps with wrap.sh script.
David Srbecky [Wed, 21 Mar 2018 12:58:00 +0000 (12:58 +0000)]
Fix mini-debug-info generation for apps with wrap.sh script.

Debuggable apps enable mini-debug-info after fork, however, this does not
work with apps with wrap.sh script since they follow different code path.

Enable mini-debug-info generation for those as well.

Bug: 74070426
Test: check that app with wrap.sh generates debug info for JIT now

(cherry picked from commit 28a89370f02b0c33d9580e870da086b7391d1500)

Merged-In: I489ac3c82bcced8fc0448ed5666f67009cbb043d
Change-Id: I22db2e889e918eb4b64c722289f7c046bb499d1d

6 years agoMerge "Fix mini-debug-info generation for apps with wrap.sh script."
David Srbecky [Fri, 23 Mar 2018 10:50:32 +0000 (10:50 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."

6 years agoMerge "audioservice: Add a property for default voice call volume" am: 9d9782ec7e
Shuhei Miyazaki [Fri, 23 Mar 2018 10:39:20 +0000 (10:39 +0000)]
Merge "audioservice: Add a property for default voice call volume" am: 9d9782ec7e
am: 2e27496bdc

Change-Id: I07ffee7104476b5153d079e5892bbae8f35708b5

6 years agoMerge "audioservice: Add a property for default voice call volume"
Shuhei Miyazaki [Fri, 23 Mar 2018 10:32:54 +0000 (10:32 +0000)]
Merge "audioservice: Add a property for default voice call volume"
am: 9d9782ec7e

Change-Id: I1830205ecc1a7e7198be1f01095b9043a95af79f

6 years ago[automerger skipped]Merge "Add multisim notifications for SST" into pi-dev
Jordan Liu [Fri, 23 Mar 2018 09:54:27 +0000 (09:54 +0000)]
[automerger skipped]Merge "Add multisim notifications for SST" into pi-dev
am: d935bd4236  -s ours

Change-Id: I29335d9f9900e879cc84992bebf5109a73279cd6

6 years agoMerge "Add multisim notifications for SST" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 09:42:40 +0000 (09:42 +0000)]
Merge "Add multisim notifications for SST" into pi-dev

6 years agoMerge "Have the status bar listen to all macro-users VPN changes." into pi-dev
Chalard Jean [Fri, 23 Mar 2018 09:35:34 +0000 (09:35 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
am: afc61792cb

Change-Id: I4e9887a438abfa1a5c9456c73c019c96193e9111

6 years agoMerge "Have the status bar listen to all macro-users VPN changes." am: b16a6053fe
Chalard Jean [Fri, 23 Mar 2018 09:29:28 +0000 (09:29 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." am: b16a6053fe
am: eb358dadac

Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824

6 years agoMerge "Have the status bar listen to all macro-users VPN changes." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 09:26:46 +0000 (09:26 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev

6 years agoMerge "Have the status bar listen to all macro-users VPN changes."
Chalard Jean [Fri, 23 Mar 2018 09:22:36 +0000 (09:22 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes."
am: b16a6053fe

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e

6 years agoMerge "Regenerate counterId when a new cert XML file is successfully imported" into...
Bo Zhu [Fri, 23 Mar 2018 09:11:05 +0000 (09:11 +0000)]
Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev
am: 8f4fae9d84

Change-Id: I5e4cf1cd5320815b8eab40178703e674a87640c5

6 years agoMerge "Regenerate counterId when a new cert XML file is successfully imported" into...
TreeHugger Robot [Fri, 23 Mar 2018 08:59:47 +0000 (08:59 +0000)]
Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev

6 years agoMerge "Layer input method on top while transitioning." into pi-dev
Robert Carr [Fri, 23 Mar 2018 08:58:49 +0000 (08:58 +0000)]
Merge "Layer input method on top while transitioning." into pi-dev
am: e47deacaab

Change-Id: Ie1dea52d7ca9ccc1d6b3da65c3dff18ef62670f8

6 years agoMerge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev
Jack He [Fri, 23 Mar 2018 08:43:52 +0000 (08:43 +0000)]
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev
am: cbb8cd77d5

Change-Id: I6bde37abe9c41ef3b2bf0ee0829eed340eb0842a

6 years agoMerge "Layer input method on top while transitioning." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 08:42:57 +0000 (08:42 +0000)]
Merge "Layer input method on top while transitioning." into pi-dev

6 years agoMerge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev
Jakub Pawlowski [Fri, 23 Mar 2018 08:38:26 +0000 (08:38 +0000)]
Merge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev
am: 3cc1a3a2e6

Change-Id: Ifb38ca475a5d65672a89767038f96198ce68b770

6 years agoMerge "audioservice: Add a property for default voice call volume"
Treehugger Robot [Fri, 23 Mar 2018 08:38:21 +0000 (08:38 +0000)]
Merge "audioservice: Add a property for default voice call volume"

6 years agoMerge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 08:22:56 +0000 (08:22 +0000)]
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev

6 years agoMerge "Have PermissionMonitor arbiter which app can access background networks" am...
Chalard Jean [Fri, 23 Mar 2018 08:22:47 +0000 (08:22 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" am: 06f0fc04e7
am: d1052c2cfa

Change-Id: I803bdbfd9344d3d2a8bd312f98a1f63636e47cd9

6 years agoMerge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 08:14:49 +0000 (08:14 +0000)]
Merge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev

6 years agoMerge "Have PermissionMonitor arbiter which app can access background networks"
Chalard Jean [Fri, 23 Mar 2018 08:12:51 +0000 (08:12 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks"
am: 06f0fc04e7

Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2

6 years agoMerge "Add new status strings in connected devices for audio switch" into pi-dev
timhypeng [Fri, 23 Mar 2018 08:01:32 +0000 (08:01 +0000)]
Merge "Add new status strings in connected devices for audio switch" into pi-dev
am: 0d56af250f

Change-Id: I250ced843b3eedeba3335bacd8d2dadb3ac8ce94

6 years agoMerge "Add new status strings in connected devices for audio switch" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 07:47:40 +0000 (07:47 +0000)]
Merge "Add new status strings in connected devices for audio switch" into pi-dev

6 years agoAdd multisim notifications for SST
Jordan Liu [Thu, 15 Mar 2018 19:19:11 +0000 (12:19 -0700)]
Add multisim notifications for SST

ServiceStateTracker posts notifications for restricted state and
rejection cause for CS registrations which need to be customzied for
multisim cases.

Bug: 69928579
Test: ServiceStateTrackerTest
Change-Id: Ia7db81da6dd858b99113432a97fb489dbebe2436
Merged-In: Ia7db81da6dd858b99113432a97fb489dbebe2436

6 years agoMerge "Have the status bar listen to all macro-users VPN changes."
Chalard Jean [Fri, 23 Mar 2018 07:33:02 +0000 (07:33 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes."

6 years agoMerge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev
Sungsoo Lim [Fri, 23 Mar 2018 07:21:17 +0000 (07:21 +0000)]
Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev
am: ff1c9fa576

Change-Id: I8eb8afef8366a071a923f398463579527f5cb37d

6 years agoMerge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 07:08:08 +0000 (07:08 +0000)]
Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev

6 years agoMerge "Have PermissionMonitor arbiter which app can access background networks" into...
Chalard Jean [Fri, 23 Mar 2018 06:48:49 +0000 (06:48 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
am: 1f654aa247

Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01

6 years agoMerge "Have PermissionMonitor arbiter which app can access background networks" into...
Chalard Jean [Fri, 23 Mar 2018 06:36:47 +0000 (06:36 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev