OSDN Git Service

android-x86/frameworks-base.git
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

6 years agoMerge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev
Hyundo Moon [Fri, 23 Mar 2018 06:20:10 +0000 (06:20 +0000)]
Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev
am: 9e5a7f2a63

Change-Id: Id70eb6d8fe60a8755b73bfe6be2f93c2c3de6bcb

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

6 years agoBluetooth: Enable in-band ringing in vibration mode (1/4)
Jack He [Tue, 13 Feb 2018 05:00:24 +0000 (21:00 -0800)]
Bluetooth: Enable in-band ringing in vibration mode (1/4)

* Add AudioSystem.FOR_VIBRATE_RINGING mode to match the native layer
  AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING force mode
* Switch to this mode when Bluetooth SCO is connected
* Modify AudioService.muteRingerModeStreams() method to not mute ringer
  volume when Bluetooth SCO is ON. Also, when ringer is unmuted, mirror
  speaker ringtone volume on Bluetooth SCO ringer

Bug: 72647074
Test: Call phone in vibration mode and hear ringtone on HFP enabled
      headset, verify that ringtone is only played through headset.
      Then disconnect headset and call again to verify that ringtone
      does not play through phone speaker in vibration mode.

Change-Id: I7d642020710c085f0e1f27c750c74b0e2fb57398

6 years agoMerge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev
Hyundo Moon [Fri, 23 Mar 2018 06:07:17 +0000 (06:07 +0000)]
Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev

6 years ago[automerger skipped]Merge "new WFC registration failure notification string" am:...
Chen Xu [Fri, 23 Mar 2018 06:06:28 +0000 (06:06 +0000)]
[automerger skipped]Merge "new WFC registration failure notification string" am: 8bcb7aa971
am: 88959d3ceb  -s ours

Change-Id: I0dc40d059ea8e7ccfe3f4974f7ee4d248e147890

6 years agoMerge "Improved autofill logging and dumping." into pi-dev
Felipe Leme [Fri, 23 Mar 2018 06:00:12 +0000 (06:00 +0000)]
Merge "Improved autofill logging and dumping." into pi-dev
am: 63df4e248a

Change-Id: Ifffb1f5266fe5702cf211fbd998f7260bb959e88

6 years agoMerge "new WFC registration failure notification string"
Chen Xu [Fri, 23 Mar 2018 05:59:05 +0000 (05:59 +0000)]
Merge "new WFC registration failure notification string"
am: 8bcb7aa971

Change-Id: I7784e82e4b788597ba9c35da7175b485230ab227

6 years agoMerge "Improved autofill logging and dumping." into pi-dev
Felipe Leme [Fri, 23 Mar 2018 05:48:26 +0000 (05:48 +0000)]
Merge "Improved autofill logging and dumping." into pi-dev

6 years agoMerge "Add multisim notifications for SST" am: 1a6228e595
Jordan Liu [Fri, 23 Mar 2018 05:10:35 +0000 (05:10 +0000)]
Merge "Add multisim notifications for SST" am: 1a6228e595
am: 3a647cd833

Change-Id: I11e378d2633851ab4658074a9cfb42da346749ea

6 years agoMerge "Add multisim notifications for SST"
Jordan Liu [Fri, 23 Mar 2018 05:04:15 +0000 (05:04 +0000)]
Merge "Add multisim notifications for SST"
am: 1a6228e595

Change-Id: I2fc3c9195da6bf47d6dcaca26d793e956619ccfa

6 years agoHearing Aid: pass proper stream type to getStreamVolumeDB
Jakub Pawlowski [Thu, 22 Mar 2018 19:31:21 +0000 (12:31 -0700)]
Hearing Aid: pass proper stream type to getStreamVolumeDB

Bug: 69623109
Test: Connect to Hearing Aid, make phone call, adjust volume to maximum
value.

Change-Id: Ib615d8dee11c48bf8d6e954b84a40ab7a3f3a4ba

6 years agoMerge "Fixed an issue where notifications were invisible on AOD" into pi-dev
Selim Cinek [Fri, 23 Mar 2018 04:57:21 +0000 (04:57 +0000)]
Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev
am: d4115f501d

Change-Id: I9dfa218bc30003581e8488d7b9d72bb192a19547

6 years agoMerge "Performing consistent vibration effects when opening notifications" into pi-dev
Selim Cinek [Fri, 23 Mar 2018 04:52:37 +0000 (04:52 +0000)]
Merge "Performing consistent vibration effects when opening notifications" into pi-dev
am: 62eb45f2fc

Change-Id: Ib58ef722368d53097f1af4f0a697513ba911d379

6 years agoMerge "Fixed an issue where the heads-up icon location was wrong" into pi-dev
Selim Cinek [Fri, 23 Mar 2018 04:48:13 +0000 (04:48 +0000)]
Merge "Fixed an issue where the heads-up icon location was wrong" into pi-dev
am: 194cca21b1

Change-Id: I3bbf2e2eb3882a8a13e456df1bf143cc823c8eec

6 years agoMerge changes I2d09a84e,I111aab35 into pi-dev
Lucas Dupin [Fri, 23 Mar 2018 04:44:16 +0000 (04:44 +0000)]
Merge changes I2d09a84e,I111aab35 into pi-dev
am: 4cfd9f242c

Change-Id: I178fbaa3d299326674b0da1fb58dd36122719f2d

6 years agoMerge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into...
Jaewan Kim [Fri, 23 Mar 2018 04:39:05 +0000 (04:39 +0000)]
Merge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into pi-dev
am: e41b39d6e9

Change-Id: I8882a20c5b50c1c13850bff3e162fa5b2be4d4f7

6 years agoHave PermissionMonitor arbiter which app can access background networks
Chalard Jean [Tue, 20 Mar 2018 10:13:57 +0000 (19:13 +0900)]
Have PermissionMonitor arbiter which app can access background networks

This will let ConnectivityService send the right callbacks to the
relevant apps.

Test: manual with apps
      runtest frameworks-net
      cts
      new tests for this functionality
Bug: 67408339

Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4

6 years agoMerge "Fixed an issue where notifications were invisible on AOD" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 04:15:38 +0000 (04:15 +0000)]
Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev

6 years agoAdd new status strings in connected devices for audio switch
timhypeng [Thu, 22 Mar 2018 09:53:17 +0000 (17:53 +0800)]
Add new status strings in connected devices for audio switch

Bug: 74134939
Test: make -j32 RunSettingsRoboTests
make -j40 RunSettingsLibRoboTests

Change-Id: I4579073572d1dc2d2c6d347efb28161cf718292e

6 years agoMerge "new WFC registration failure notification string" into pi-dev
Chen Xu [Fri, 23 Mar 2018 04:10:53 +0000 (04:10 +0000)]
Merge "new WFC registration failure notification string" into pi-dev
am: 397b0d0dd5

Change-Id: Ic7cfa7ea9d7fb0526843ca5e2cfc82fc73202826

6 years agoMerge "Merge "Hide Media*2 APIs" into pi-dev am: d847d7d0a9" into pi-dev-plus-aosp
Android Build Merger (Role) [Fri, 23 Mar 2018 04:04:30 +0000 (04:04 +0000)]
Merge "Merge "Hide Media*2 APIs" into pi-dev am: d847d7d0a9" into pi-dev-plus-aosp

6 years agoMerge "Hide Media*2 APIs" into pi-dev
Jean-Michel Trivi [Fri, 23 Mar 2018 04:04:01 +0000 (04:04 +0000)]
Merge "Hide Media*2 APIs" into pi-dev
am: d847d7d0a9

Change-Id: I29a18f6592ecc3f79483dacea6ca294a226ca792

6 years agoMerge "Add method to NetworkStatsService for UID stats." am: db89ca3c12
Remi NGUYEN VAN [Fri, 23 Mar 2018 04:01:09 +0000 (04:01 +0000)]
Merge "Add method to NetworkStatsService for UID stats." am: db89ca3c12
am: af2fafe743

Change-Id: I2527d95000c7500c824ede70f87ecb38e21ed323

6 years agoMerge "new WFC registration failure notification string"
Chen Xu [Fri, 23 Mar 2018 04:00:25 +0000 (04:00 +0000)]
Merge "new WFC registration failure notification string"

6 years agoMerge "Add method to NetworkStatsService for UID stats."
Remi NGUYEN VAN [Fri, 23 Mar 2018 03:54:13 +0000 (03:54 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
am: db89ca3c12

Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a

6 years agoMerge "Add multisim notifications for SST"
Treehugger Robot [Fri, 23 Mar 2018 03:47:48 +0000 (03:47 +0000)]
Merge "Add multisim notifications for SST"

6 years agoMerge "Performing consistent vibration effects when opening notifications" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 03:43:49 +0000 (03:43 +0000)]
Merge "Performing consistent vibration effects when opening notifications" into pi-dev

6 years agoMerge "Fixed an issue where the heads-up icon location was wrong" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 03:39:29 +0000 (03:39 +0000)]
Merge "Fixed an issue where the heads-up icon location was wrong" into pi-dev

6 years agoMerge "Allow developer options in retail mode" into pi-dev
Christine Franks [Fri, 23 Mar 2018 03:31:48 +0000 (03:31 +0000)]
Merge "Allow developer options in retail mode" into pi-dev
am: 0f4545ac64

Change-Id: Idf9fb0805d81e6078ed8bdb029c6f885b0813004

6 years agoMerge changes I2d09a84e,I111aab35 into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 03:23:27 +0000 (03:23 +0000)]
Merge changes I2d09a84e,I111aab35 into pi-dev

* changes:
  Do not show bouncer when fading away
  KeyguardBouncer#isShowing fix

6 years agoMerge "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode...
Felipe Leme [Fri, 23 Mar 2018 03:11:32 +0000 (03:11 +0000)]
Merge "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode." into pi-dev
am: 0cdac33f8f

Change-Id: Ic974a584f3e71e4bb618b9e2f1b83121ca327071

6 years agoMerge "Add extra checks around the profile file descriptor." into pi-dev
Calin Juravle [Fri, 23 Mar 2018 03:07:44 +0000 (03:07 +0000)]
Merge "Add extra checks around the profile file descriptor." into pi-dev
am: 2df6aa4178

Change-Id: Ibe5118538ab78dbe3cd390387359fd8af267854e

6 years agoMerge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev
John W. Bruce [Fri, 23 Mar 2018 03:04:54 +0000 (03:04 +0000)]
Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev
am: 6ab6a9d433

Change-Id: I720bd982b19a619f28ab4fe96a66e9683dbb7d14

6 years agoMerge "Updated the styling for notifications" into pi-dev
Selim Cinek [Fri, 23 Mar 2018 03:01:17 +0000 (03:01 +0000)]
Merge "Updated the styling for notifications" into pi-dev
am: 51856fde2b

Change-Id: I8d7b12955763d4d286119e976901fb55cb7a023e

6 years agoMerge "Fixed an issue where the roundness of a notification could be wrong" into...
Selim Cinek [Fri, 23 Mar 2018 02:58:17 +0000 (02:58 +0000)]
Merge "Fixed an issue where the roundness of a notification could be wrong" into pi-dev
am: 65cb06cfc5

Change-Id: I0800723e0c6b1b4b0b277d1a2b69859bb0e791cd

6 years agoMerge "Ensuring that headsups go away when unpinning via active edge" into pi-dev
Selim Cinek [Fri, 23 Mar 2018 02:52:34 +0000 (02:52 +0000)]
Merge "Ensuring that headsups go away when unpinning via active edge" into pi-dev
am: 6ece0f3f62

Change-Id: I0e77a746106a975bf75cf7e3a932e5925ae9d30b

6 years agoMerge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into...
Jaewan Kim [Fri, 23 Mar 2018 02:47:25 +0000 (02:47 +0000)]
Merge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into pi-dev

6 years agoMerge "Add TestablesTests to device-tests for APCT suite" into pi-dev
Julien Desprez [Fri, 23 Mar 2018 02:42:37 +0000 (02:42 +0000)]
Merge "Add TestablesTests to device-tests for APCT suite" into pi-dev
am: d9bd20b0dc

Change-Id: I8520c9f2ea4b7f26c8e9dc75aadb5fb4497e0f5b

6 years agoMerge "Add method to NetworkStatsService for UID stats."
Remi NGUYEN VAN [Fri, 23 Mar 2018 02:39:00 +0000 (02:39 +0000)]
Merge "Add method to NetworkStatsService for UID stats."

6 years agoMerge "Enable Checkstyle for "repo upload" for more projects." am: dd6764a522
Jack Yu [Fri, 23 Mar 2018 02:31:36 +0000 (02:31 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am: dd6764a522
am: 2ff91e5132

Change-Id: Ie880f61f511ad51011607c531c9028376e5683d1

6 years agoMerge "Enable Checkstyle for "repo upload" for more projects."
Jack Yu [Fri, 23 Mar 2018 02:25:24 +0000 (02:25 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
am: dd6764a522

Change-Id: I0398c058a35fd644aa949375a53719ba85572408

6 years agoFixed an issue where notifications were invisible on AOD
Selim Cinek [Fri, 23 Mar 2018 02:10:29 +0000 (19:10 -0700)]
Fixed an issue where notifications were invisible on AOD

Because of the new screen off animation, the shelf would
be positioned wrongly and therefore the icons would
be clipped.
We'll have to revisit this positioning, when we do the real AOD
layout, for now we place the invisible shelf at the bottom
of the last notification.

Change-Id: If2bd7c71957585ac73ace004221e48c5b5f134af
Fixes: 76160478
Test: add ambient notification,  observe  normal clipping

6 years agoMerge "Make PrecomputedText Spannable for supporting selection" into pi-dev
Seigo Nonaka [Fri, 23 Mar 2018 02:08:23 +0000 (02:08 +0000)]
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
am: 02c8d1b07f

Change-Id: Ida44cb2d564b0b16272915f7f0f181b98452c1ca

6 years agoRegenerate counterId when a new cert XML file is successfully imported
Bo Zhu [Thu, 22 Mar 2018 03:45:09 +0000 (20:45 -0700)]
Regenerate counterId when a new cert XML file is successfully imported

Bug: 74027192
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I785b49856693d00545b35759181eaa53741b87ab

6 years agoMerge "Fix StorageManager stack use after scope." into pi-dev
Yao Chen [Fri, 23 Mar 2018 02:03:38 +0000 (02:03 +0000)]
Merge "Fix StorageManager stack use after scope." into pi-dev
am: 5f8939eecd

Change-Id: I32bef5d320a48e3387f4ebb353038c29823ebcc0

6 years agoChanges ONN notification texts to re-use with CNN
Mehdi Alizadeh [Fri, 23 Mar 2018 02:00:35 +0000 (02:00 +0000)]
Changes ONN notification texts to re-use with CNN
am: 32a7c19c5b

Change-Id: Ida9491722180ffef81ec28b7faeba5967fc48d4a

6 years agoAdds entries for Soft AP channel and bandwidth
Mehdi Alizadeh [Fri, 23 Mar 2018 01:59:22 +0000 (01:59 +0000)]
Adds entries for Soft AP channel and bandwidth
am: 2449819b69

Change-Id: Ie9da4bfe579d2cc72c16b43558d5e4ebdd75300a

6 years agoMerge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev
Nathan Harold [Fri, 23 Mar 2018 01:57:41 +0000 (01:57 +0000)]
Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev
am: 0205fd1064

Change-Id: I7f1c987901c3634fb81d93402d5cb0af80fff11e

6 years agoMerge "Only print out services if they did something." into pi-dev
Kweku Adams [Fri, 23 Mar 2018 01:50:24 +0000 (01:50 +0000)]
Merge "Only print out services if they did something." into pi-dev
am: 3c0f0b3e8b

Change-Id: Ie216a8b8e75a4e8e384e1390fe8cda97a64171af

6 years agoMerge "Don't try to create a process group when not root." into pi-dev
Torne (Richard Coles) [Fri, 23 Mar 2018 01:41:53 +0000 (01:41 +0000)]
Merge "Don't try to create a process group when not root." into pi-dev
am: 5526509f17

Change-Id: If2278523802ed4c29ff2b63641b72d31c2a5fbb9

6 years agoMerge "Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionCo...
Philip P. Moltmann [Fri, 23 Mar 2018 01:34:08 +0000 (01:34 +0000)]
Merge "Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionConfig) via reflection" into pi-dev
am: a93efabc24

Change-Id: I13a35a1fbfd26bdb646823b258914299620807dc

6 years agoMerge "new WFC registration failure notification string" into pi-dev
Chen Xu [Fri, 23 Mar 2018 01:33:08 +0000 (01:33 +0000)]
Merge "new WFC registration failure notification string" into pi-dev

6 years agoMerge "Fix smart_linkify_enabled flag." into pi-dev
Abodunrinwa Toki [Fri, 23 Mar 2018 01:26:34 +0000 (01:26 +0000)]
Merge "Fix smart_linkify_enabled flag." into pi-dev
am: e9a7cb8158

Change-Id: I8789a58acd22898dfa0ff301132efbafbf8ab8d8

6 years agoMerge "QS edit mode fixes." into pi-dev
Amin Shaikh [Fri, 23 Mar 2018 01:18:25 +0000 (01:18 +0000)]
Merge "QS edit mode fixes." into pi-dev
am: c6de4240d5

Change-Id: I33179a69d3805e454e04655e8760c8d322d89377

6 years agoMerge "Hide Media*2 APIs" into pi-dev
Jean-Michel Trivi [Fri, 23 Mar 2018 01:12:14 +0000 (01:12 +0000)]
Merge "Hide Media*2 APIs" into pi-dev

6 years agoMerge "Allow developer options in retail mode" into pi-dev
Christine Franks [Fri, 23 Mar 2018 01:11:22 +0000 (01:11 +0000)]
Merge "Allow developer options in retail mode" into pi-dev

6 years agoMerge "Fixes hiding track for quick scrub" into pi-dev
Matthew Ng [Fri, 23 Mar 2018 01:10:21 +0000 (01:10 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev
am: 4fb9723faa

Change-Id: I08ceb806a1bd89e8ec58968e06c4aa6286a7baa3

6 years agoMerge "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode...
Felipe Leme [Fri, 23 Mar 2018 01:05:29 +0000 (01:05 +0000)]
Merge "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode." into pi-dev

6 years agoMerge "Add extra checks around the profile file descriptor." into pi-dev
Calin Juravle [Fri, 23 Mar 2018 01:05:19 +0000 (01:05 +0000)]
Merge "Add extra checks around the profile file descriptor." into pi-dev

6 years agoMerge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 01:02:30 +0000 (01:02 +0000)]
Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev

6 years agoMerge "PhoneWindowTest: promote to presubmit" into pi-dev
Adrian Roos [Fri, 23 Mar 2018 00:59:36 +0000 (00:59 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev
am: 7fd2abdf41

Change-Id: I0c8031cb69a7176b877ff00462f2dfb555be24be

6 years agoMerge "Enable Checkstyle for "repo upload" for more projects."
Treehugger Robot [Fri, 23 Mar 2018 00:59:13 +0000 (00:59 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."

6 years agoMerge "Assign -1 as default value of window type and owner uid." into pi-dev
Rose Liu [Fri, 23 Mar 2018 00:51:52 +0000 (00:51 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev
am: a194d92495

Change-Id: I8169e627f61659dc27ba7caa452cc2bc4f69efd7

6 years agoMerge "Removed urlBarResourceId." into pi-dev
Felipe Leme [Fri, 23 Mar 2018 00:39:16 +0000 (00:39 +0000)]
Merge "Removed urlBarResourceId." into pi-dev
am: 3a31f6c5cc

Change-Id: Ic039210e17b1f49d4232b97acdd46befcbd896d3

6 years agoMerge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
Suprabh Shukla [Fri, 23 Mar 2018 00:09:48 +0000 (00:09 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
am: 6affc07065

Change-Id: Icd9ccea90cac3b367b74915f76d39d7f5f740687

6 years agonew WFC registration failure notification string
fionaxu [Thu, 22 Mar 2018 23:37:54 +0000 (16:37 -0700)]
new WFC registration failure notification string

Bug: 37579327
Test: Manual
Change-Id: I5adaf643b2b2c86cac28dabb944765d0a8bcefd0
(cherry picked from commit 6ac589ae665b2190a762d71948de6f41922352d6)
Merged-in: I5adaf643b2b2c86cac28dabb944765d0a8bcefd0

6 years agoMerge "Listen to all attached QS pages." into pi-dev
Amin Shaikh [Fri, 23 Mar 2018 00:04:17 +0000 (00:04 +0000)]
Merge "Listen to all attached QS pages." into pi-dev
am: fc16c4b3c4

Change-Id: Ia92a611955f44889602a8d6bb1e630abc4a06578

6 years agoMerge "Updated the styling for notifications" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 00:02:35 +0000 (00:02 +0000)]
Merge "Updated the styling for notifications" into pi-dev

6 years agoMerge "Add vol up + power ringer toggle gesture" into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 23:58:37 +0000 (23:58 +0000)]
Merge "Add vol up + power ringer toggle gesture" into pi-dev
am: 224e2fb2ef

Change-Id: I3b15061159a345a006dc0f5f532e93291ca1b383

6 years agoMerge "Fixed an issue where the roundness of a notification could be wrong" into...
TreeHugger Robot [Thu, 22 Mar 2018 23:55:10 +0000 (23:55 +0000)]
Merge "Fixed an issue where the roundness of a notification could be wrong" into pi-dev

6 years agoEnable Checkstyle for "repo upload" for more projects.
Jack Yu [Thu, 22 Mar 2018 23:28:13 +0000 (16:28 -0700)]
Enable Checkstyle for "repo upload" for more projects.

This CL enables Checkstyle for the following directories:
- telephony/

Bug: 3474664632954735
Test: Compilation
Change-Id: Ia67eaf5b871e6b74f21344fef1572835801843a5

6 years agoMerge "Ensuring that headsups go away when unpinning via active edge" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 23:45:13 +0000 (23:45 +0000)]
Merge "Ensuring that headsups go away when unpinning via active edge" into pi-dev

6 years agoMerge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage...
Leon Scroggins [Thu, 22 Mar 2018 23:43:38 +0000 (23:43 +0000)]
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev
am: ceb14e015b

Change-Id: I92ffd12b6e8df360a86733ca99676cd8f470addb