OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev
Dianne Hackborn [Mon, 12 Jun 2017 16:47:19 +0000 (16:47 +0000)]
Merge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev
am: 4eb76b2db8

Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3

7 years agoMerge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev
Dianne Hackborn [Mon, 12 Jun 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Work on issue #62390590: SecurityException in JobIntentService$..." into oc-dev

7 years agoMerge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
Chris Thornton [Mon, 12 Jun 2017 16:37:03 +0000 (16:37 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am: 484fb951e0  -s ours

Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d

7 years agoMerge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
Chris Thornton [Mon, 12 Jun 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev

7 years agoMerge "Round the slashes of SlashDrawable" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 15:42:14 +0000 (15:42 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev

7 years agoChange the multipath hint default to 0.
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:31 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am: d1e7d3d73e

Change-Id: Iab590e33a1ae64701f0023970d53b23470533962

7 years agoChange the multipath hint default to 0.
Lorenzo Colitti [Mon, 12 Jun 2017 10:01:34 +0000 (19:01 +0900)]
Change the multipath hint default to 0.

It was set to 3 (handover+reliability) during the development
cycle, but should not be set to a nonzero value on user devices
until the returned value takes into account the amount of
non-default network data usage.

Bug: 34630278
Test: marlin builds and boots
Test: ConnectivityServiceTest passes
Change-Id: I2b09a6e09c497886862cbaaaf3b283dedfbfa94c

7 years agoMerge "Add additional mocking for Context innards" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 05:06:35 +0000 (05:06 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev

7 years agoMerge "Convert IControlsTethering from interface into callback" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 04:53:19 +0000 (04:53 +0000)]
Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev

7 years agoPrevent ConcurrentModificationException in updateAllRecognitions
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
Prevent ConcurrentModificationException in updateAllRecognitions

When invoking updateAllRecognitions, if a callback binder was determined
to have died, an internal function would go and remove it from
mModelDataMap. However, updateAllRecognitions was iterating over this
map, so it would then explode. By first making a copy of the model datas
before iterating over all of them, this problem is avoided.

(As part of trying to figure out what was happening, also updated all
the method names that implicitly assumed they had a lock, and double
checked that everything with a Locked suffix is actually locked)

Bug: 62487479
Test: Use the sound trigger test app to load and start two models, force
kill the app (so the dangling binders hang around), then enable power
save (which triggers the call to updateAllRecognitions)

Change-Id: I87b9dfc1b2af5e294050b146737916ccaad882c1

7 years agoMerge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc...
Chris Thornton [Sun, 11 Jun 2017 17:56:21 +0000 (17:56 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev

7 years agoAdd additional mocking for Context innards
Erik Kline [Wed, 7 Jun 2017 07:33:19 +0000 (16:33 +0900)]
Add additional mocking for Context innards

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Merged-In: I2695841bfc31280060754132e589af1ca95911da
Merged-In: I9a05f34035a15b233a44d517f2b2426481679974
Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
(cherry picked from commit ec37275ec9702b56bf328031675906a5483b89d4)

7 years agoConvert IControlsTethering from interface into callback
Erik Kline [Tue, 6 Jun 2017 10:24:21 +0000 (19:24 +0900)]
Convert IControlsTethering from interface into callback

Additionally:
    - add updateLinkProperties() method to new callback
    - skeletally connect LinkProperties updates through
      to OffloadController

TODOs liberally sprinkled through out.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Merged-In: I178130e65db4fef26d62ea7eaa9a52f7e8103432
Merged-In: I832d77747de7517513c22d36fff4a2fa2bb95154
Change-Id: I631d17b26be153534551a1615931fc98b598b953
(cherry picked from commit ab6439b0f8dd0a67c81235a3fc4d9c149de3780d)

7 years agoPrevent ConcurrentModificationException in updateAllRecognitions
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
Prevent ConcurrentModificationException in updateAllRecognitions

When invoking updateAllRecognitions, if a callback binder was determined
to have died, an internal function would go and remove it from
mModelDataMap. However, updateAllRecognitions was iterating over this
map, so it would then explode. By first making a copy of the model datas
before iterating over all of them, this problem is avoided.

(As part of trying to figure out what was happening, also updated all
the method names that implicitly assumed they had a lock, and double
checked that everything with a Locked suffix is actually locked)

Bug: 62487479
Test: Use the sound trigger test app to load and start two models, force
kill the app (so the dangling binders hang around), then enable power
save (which triggers the call to updateAllRecognitions)

Change-Id: I87b9dfc1b2af5e294050b146737916ccaad882c1

7 years agoMerge "Added 'dumpsys activity lastanr'" into oc-dev
Wale Ogunwale [Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am: b32fecd6e0

Change-Id: Iede7911ea687b7890833ee967da010db6041fb49

7 years agoMerge "Added 'dumpsys activity lastanr'" into oc-dev
Wale Ogunwale [Sat, 10 Jun 2017 15:58:07 +0000 (15:58 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 10 Jun 2017 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoUpdate captive portal notif for Android TV
Rhiannon Malia [Sat, 10 Jun 2017 07:26:51 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am: 6ab655227a

Change-Id: I60a67b0f22aa186e8b738b8a9ee002b2b5b04e42

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 10 Jun 2017 06:06:21 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 10 Jun 2017 06:03:05 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 10 Jun 2017 06:00:04 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoUpdate captive portal notif for Android TV
Rhiannon Malia [Mon, 5 Jun 2017 22:02:55 +0000 (15:02 -0700)]
Update captive portal notif for Android TV

Test: Connect to captive portal, notification appears in side panel

BUG:38453402
Change-Id: I39baf90897f2f3d67b8b03c31dd74fa1d39d39de

7 years agoMerge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
Winson Chung [Sat, 10 Jun 2017 04:56:09 +0000 (04:56 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d

7 years agoMerge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
Winson Chung [Sat, 10 Jun 2017 04:50:09 +0000 (04:50 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Jun 2017 01:14:37 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9310dd36258cc026421953cbea84b51650c47a35
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Jun 2017 00:56:14 +0000 (17:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1b6c615bb62abbb74f14adb70b5e29d96d3aeaad
Auto-generated-cl: translation import

7 years agoMerge "Don't reset the value of package_verifier_enable if not in demo mode" into...
Ben Gruver [Sat, 10 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Jun 2017 00:44:49 +0000 (17:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8a17e54b671202d6e1393410e2c9cc90552e3c32
Auto-generated-cl: translation import

7 years agoMerge "Don't reset the value of package_verifier_enable if not in demo mode" into...
Ben Gruver [Sat, 10 Jun 2017 00:38:54 +0000 (00:38 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Jun 2017 00:37:30 +0000 (17:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia5c68401fedb31ebd81cffb9700833d9dd1f71a5
Auto-generated-cl: translation import

7 years agoAdded 'dumpsys activity lastanr'
Wale Ogunwale [Fri, 9 Jun 2017 22:20:29 +0000 (15:20 -0700)]
Added 'dumpsys activity lastanr'

Allows for dumping the activity state during the last anr. This will
also be included in collected bug reports.

Bug: 38121026
Test: Cause an anr to occur and run 'adb shell dumpsys activity lastanr'
Change-Id: I1e4200f9e5cc16bfab98e5af31fc599cdd54cd11

7 years agoWork on issue #62390590: SecurityException in JobIntentService$...
Dianne Hackborn [Fri, 9 Jun 2017 23:06:01 +0000 (16:06 -0700)]
Work on issue #62390590: SecurityException in JobIntentService$...

...JobServiceEngineImpl$WrapperWorkItem.complete

Add more useful information in the security exception message that
is shown -- the reason the last job that was running on the context
was stopped.  This should tell you why when you are calling at that
point your job is no longer running.

Test: bit CtsJobSchedulerTestCases:*

Change-Id: Ia7155248b4b4f032cbf8e8754c5437f658ed192c

7 years agoMerge "Add target sdk check for behavior change." into oc-dev
George Mount [Fri, 9 Jun 2017 23:49:21 +0000 (23:49 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792

7 years agoMerge "Add target sdk check for behavior change." into oc-dev
George Mount [Fri, 9 Jun 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev

7 years agoMerge "Fix thread booster" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]
Merge "Fix thread booster" into oc-dev
am: 4c1209e00e

Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387

7 years agoMerge "Removed test from presubmit." into oc-dev
Lucas Dupin [Fri, 9 Jun 2017 23:26:36 +0000 (23:26 +0000)]
Merge "Removed test from presubmit." into oc-dev
am: 4f30aa2be8

Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4

7 years agoMerge "Fix thread booster" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Fix thread booster" into oc-dev

7 years agoMerge "Instrument captive portal login activity" into oc-dr1-dev
Hugo Benichi [Fri, 9 Jun 2017 23:17:22 +0000 (23:17 +0000)]
Merge "Instrument captive portal login activity" into oc-dr1-dev

7 years agoMerge "Removed test from presubmit." into oc-dev
TreeHugger Robot [Fri, 9 Jun 2017 23:17:13 +0000 (23:17 +0000)]
Merge "Removed test from presubmit." into oc-dev

7 years agoMerge "" into oc-dev
Daniel Sandler [Fri, 9 Jun 2017 23:05:29 +0000 (23:05 +0000)]
Merge "" into oc-dev
am: 0aaae4ae78

Change-Id: Ibeceac21612da6669d0a216729c2671170651480

7 years agoMerge "🐙" into oc-dev
Daniel Sandler [Fri, 9 Jun 2017 22:55:42 +0000 (22:55 +0000)]
Merge "🐙" into oc-dev

7 years agoMerge "Minor fix on autofill() javadoc." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 22:13:59 +0000 (22:13 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am: 211e760408

Change-Id: I1dddd4e6a326ccd0fb6f57dbd30b0c4ba0d08106

7 years agoMerge "Minor fix on autofill() javadoc." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 22:02:40 +0000 (22:02 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
Todd Lee [Fri, 9 Jun 2017 22:01:45 +0000 (22:01 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
am: 1b39c88b97

Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Siyamed Sinir [Fri, 9 Jun 2017 21:56:09 +0000 (21:56 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15

7 years agoMerge "Protect autofill UI against redressing" into oc-dev
Svetoslav Ganov [Fri, 9 Jun 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev
Lei Yu [Fri, 9 Jun 2017 21:42:25 +0000 (21:42 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046

7 years agoCopy smearing method to BatteryStatsHelper
jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]
Copy smearing method to BatteryStatsHelper
am: 5dad8068e2  -s ours

Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100

7 years agoPreemptively create Bitmap from GraphicBuffer
Winson Chung [Fri, 9 Jun 2017 21:38:39 +0000 (14:38 -0700)]
Preemptively create Bitmap from GraphicBuffer

- This call moves up the code to create a ThumbnailData from the
  TaskSnapshot to ensure that it is registered with the GC even if there
  is no active TaskView bound to process the event.

Bug: 62360156
Test: Run "bit CtsMediaTestCases:.DecodeAccuracyTest", and ensure that
      the "Lost RAM" is relatively unchanged afterwards

Change-Id: I64af55aa40e80604864e17045798823cc6fee483

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7
Todd Lee [Fri, 9 Jun 2017 21:16:04 +0000 (21:16 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7
am: a58e208394

Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a

7 years agoRemoved test from presubmit.
Lucas Dupin [Fri, 9 Jun 2017 21:10:33 +0000 (14:10 -0700)]
Removed test from presubmit.

testOnNotification_stillWorksAfterOneFailedProxCheck needs to
be ignored on presubmit runs. It fails on Tree Hugger but
runs locally.

Test: runtest systemui
Change-Id: Id4e1107528715c7e0b6ce7c69e2da7fa837e79a2

7 years agoAdd missing values for screen percent width dimens
Todd Lee [Fri, 9 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Add missing values for screen percent width dimens
am: 5fc6653ea7

Change-Id: Icecf451c5cb97275234f75f55292729a5f213560

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4

Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Chen Xu [Fri, 9 Jun 2017 21:00:26 +0000 (21:00 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Siyamed Sinir [Fri, 9 Jun 2017 20:58:30 +0000 (20:58 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2
Hemant Gupta [Fri, 9 Jun 2017 20:57:41 +0000 (20:57 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a

7 years agoDon't reset the value of package_verifier_enable if not in demo mode
Ben Gruver [Thu, 8 Jun 2017 22:54:48 +0000 (15:54 -0700)]
Don't reset the value of package_verifier_enable if not in demo mode

Also, use the correct default value when querying the setting when
starting demo mode.

BUG: 62346506
Test: manually flash and run through setup wizard

Change-Id: Ie9a5ae8a998eb267fcf1f509cb93ea6f566b3c96

7 years agoMerge "Add IApnSourceService.aidl" into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev

7 years agoMerge "Protect autofill UI against redressing" into oc-dev
Svetoslav Ganov [Fri, 9 Jun 2017 20:53:26 +0000 (20:53 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev
Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev

* changes:
  Batterystats logs smeared power model values
  Copy smearing method to BatteryStatsHelper

7 years agoMerge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev

7 years ago🐙
Dan Sandler [Fri, 9 Jun 2017 03:52:45 +0000 (23:52 -0400)]
🐙

It's convenient that this release is Android 8.

Bug: 32956843
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Change-Id: I9bb02b212fa241c17f03ef11c5c52dba0e6a746e

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev

7 years agoFix thread booster
Jorim Jaggi [Fri, 9 Jun 2017 19:00:58 +0000 (12:00 -0700)]
Fix thread booster

We need to conditionally set the prevPriority only if we enter
the first locked section. Otherwise we'll never reset back to the
lower priorities.

Test: Make sure no binder threads are stuck at 110.
Test: go/wm-smoke
Bug: 36631902
Change-Id: I8a9c329bc3084371022da91eabee45943c1b8c9f

7 years agoAdd missing values for screen percent width dimens
Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]
Add missing values for screen percent width dimens

Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.

Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).

bug: b/37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2

Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.

Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
      verified that connection and transfer happens over L2CAP.
      Connected with Remote PBAP Client supporting PBAP 1.1 and
      and verified that connection and transfer happens over RFCOMM.
      TestTracker: 89053
Bug: 33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit 9e91b62c1fa4f6c51f53ddb3f2155f345be30a2a)

7 years agoMerge "Removing legacy default thumbnail logic." into oc-dev
Winson Chung [Fri, 9 Jun 2017 17:56:26 +0000 (17:56 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
am: a0e44e7335

Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7

7 years agoMerge "Removing legacy default thumbnail logic." into oc-dev
Winson Chung [Fri, 9 Jun 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev

7 years agoMerge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
Lei Yu [Fri, 9 Jun 2017 17:46:26 +0000 (17:46 +0000)]
Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev

7 years agoAdd IApnSourceService.aidl
Jordan Liu [Tue, 23 May 2017 20:07:07 +0000 (13:07 -0700)]
Add IApnSourceService.aidl

This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508

7 years agoMerge "Replace fonts of unknown origin" into oc-dev
Clara Bayarri [Fri, 9 Jun 2017 17:37:59 +0000 (17:37 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
am: 3eae564fec

Change-Id: I9993d1afdbf3cd88cfd1861872baa7b0ee23e7ba

7 years agoMerge "Replace fonts of unknown origin" into oc-dev
Clara Bayarri [Fri, 9 Jun 2017 17:31:14 +0000 (17:31 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev

7 years agoMerge "Add notification listener plugin hook" into oc-dr1-dev
Jason Monk [Fri, 9 Jun 2017 16:57:44 +0000 (16:57 +0000)]
Merge "Add notification listener plugin hook" into oc-dr1-dev

7 years agoRound the slashes of SlashDrawable
Evan Laird [Thu, 8 Jun 2017 14:36:57 +0000 (10:36 -0400)]
Round the slashes of SlashDrawable

Draw the slashes vertically as rounded rects, and then rotate them 45
degrees. Rounded-ness is 1dp.

The slash is animated over a period of 350ms.

Test: visual
Bug: 37013523
Change-Id: I25d82041936ed91b77f539005dcfb326bd8cc8c7

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 9 Jun 2017 16:10:02 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 728c610446  -s ours

Change-Id: Ide88aef2c9d0a04ed9376fcb45d3277f9e749afa

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 9 Jun 2017 16:02:23 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Fix the finding logic of MediaButtonSession" into oc-dev
Sungsoo Lim [Fri, 9 Jun 2017 15:42:50 +0000 (15:42 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am: 9cfd30202d

Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0

7 years agoMerge "Fix the finding logic of MediaButtonSession" into oc-dev
Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 9 Jun 2017 14:01:59 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import

7 years agoMerge "Fix deadlock when create alert window notification" into oc-dev
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am: 678477b383

Change-Id: I2c6149881b738777ed309209538c5d9726d36c36

7 years agoMerge "Fix deadlock when create alert window notification" into oc-dev
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev

7 years agoMerge "Prioritize reused activity's stack over computed stack." into oc-dev
Bryce Lee [Fri, 9 Jun 2017 11:18:04 +0000 (11:18 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am: ac56b8adde

Change-Id: I78c8fc62d4050546896262245785084fd5cab609

7 years agoMerge "Prioritize reused activity's stack over computed stack." into oc-dev
Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev

7 years agoMerge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
Romain Guy [Fri, 9 Jun 2017 06:34:35 +0000 (06:34 +0000)]
Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev

7 years agoadd an extra for rebroadcast of SIM_STATE_CHANGED
fionaxu [Thu, 8 Jun 2017 22:48:05 +0000 (15:48 -0700)]
add an extra for rebroadcast of SIM_STATE_CHANGED

Bug: 62459330
Test: Manaual Test
Change-Id: I0e1c676d99a38273047a84d4467cff44dae7c5af

7 years agoFix the finding logic of MediaButtonSession
Sungsoo [Fri, 9 Jun 2017 03:59:47 +0000 (12:59 +0900)]
Fix the finding logic of MediaButtonSession

When we find a media button session with the given UID, we should
ignore the sessions whose playback state is not set.

Bug: 62373831
Test: passed CtsMediaTestCases
Change-Id: I484c888c5bdbceb85dd4524c1353906efc0c4f02

7 years agoMerge "Fixed an issue where the notification could stay userlocked" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:36:31 +0000 (04:36 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am: dc66506f0a

Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed

7 years agoMerge "Fixed a bug where systemui could crash while cloning" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:30:47 +0000 (04:30 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am: b9eb205bd7

Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21

7 years agoMerge "Fixed an issue where the notification could stay userlocked" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:25:36 +0000 (04:25 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev

7 years agoMerge "Fixed a bug where systemui could crash while cloning" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:21:59 +0000 (04:21 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev

7 years agoMerge "Properly run window animations at vsync-sf (1/2)" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:15:12 +0000 (04:15 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am: d1f55f6302

Change-Id: Ibbb9214593ee1b5dd51a0b0da8815c270b875257

7 years agoMerge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:11:31 +0000 (04:11 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am: 713ad88afe

Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039

7 years agoMerge "Properly run window animations at vsync-sf (1/2)" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:06:38 +0000 (04:06 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev

7 years agoMerge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:05:31 +0000 (04:05 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev

7 years agoInstrument captive portal login activity
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity

Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.

Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: manually tested with captive portal testing setup while watching
      event logs: adb logcat -b events | grep captiveportallogin
        06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
        06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]

Change-Id: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
(cherry picked from commit c61dc92fc0619d101c4b789f6305012701cc47a0)

7 years agoMinor fix on autofill() javadoc.
Felipe Leme [Fri, 9 Jun 2017 01:50:05 +0000 (18:50 -0700)]
Minor fix on autofill() javadoc.

Bug: 62465574
Test: N/A

Change-Id: I4a55b4064a8af835e962a77c6ad55a29c1954efd

7 years agoIgnore dispatchProvideStructureForAutofill() when layout is being updated.
Felipe Leme [Fri, 9 Jun 2017 01:12:32 +0000 (18:12 -0700)]
Ignore dispatchProvideStructureForAutofill() when layout is being updated.

View already checks if its layout is being updated when calling
notifyEnterOrExitForAutoFillIfNeeded(), but that doesn't prevent apps crashing
when the autofill process was triggered by another view.

Test: existing CtsAutoFillServiceTestCases pass
Fixes: 38198484

change-Id: I8e9435ddc4cf21fb648d39aace93f3af0e1fdf4f