Commit Graph

325881 Commits

Author SHA1 Message Date
Hemant Gupta
e2ac2e20d6 OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a
2017-06-09 20:57:41 +00:00
TreeHugger Robot
49444fc090 Merge "Add IApnSourceService.aidl" into oc-dr1-dev 2017-06-09 20:54:25 +00:00
Jeff Sharkey
c017d299ce Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev 2017-06-09 20:23:23 +00:00
Hemant Gupta
6f2b75f574 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 9e91b62c1f)
2017-06-09 18:21:56 +00:00
Winson Chung
fc926a938e Merge "Removing legacy default thumbnail logic." into oc-dev
am: a0e44e7335

Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7
2017-06-09 17:56:26 +00:00
Winson Chung
a0e44e7335 Merge "Removing legacy default thumbnail logic." into oc-dev 2017-06-09 17:50:50 +00:00
Lei Yu
02ece2f486 Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev 2017-06-09 17:46:33 +00:00
Jordan Liu
6d783e3529 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
2017-06-09 10:41:37 -07:00
Clara Bayarri
f93c97f73e Merge "Replace fonts of unknown origin" into oc-dev
am: 3eae564fec

Change-Id: I9993d1afdbf3cd88cfd1861872baa7b0ee23e7ba
2017-06-09 17:37:59 +00:00
Clara Bayarri
3eae564fec Merge "Replace fonts of unknown origin" into oc-dev 2017-06-09 17:31:22 +00:00
Jason Monk
8f8b5ac031 Merge "Add notification listener plugin hook" into oc-dr1-dev 2017-06-09 16:57:49 +00:00
Bill Yi
1de3fd81e0 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 728c610446  -s ours

Change-Id: Ide88aef2c9d0a04ed9376fcb45d3277f9e749afa
2017-06-09 16:10:02 +00:00
TreeHugger Robot
728c610446 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-09 16:02:29 +00:00
Sungsoo Lim
acd925d497 Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am: 9cfd30202d

Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0
2017-06-09 15:42:50 +00:00
Sungsoo Lim
9cfd30202d Merge "Fix the finding logic of MediaButtonSession" into oc-dev 2017-06-09 15:38:48 +00:00
Bill Yi
4ae0807ac0 Import translations. DO NOT MERGE
Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import
2017-06-09 07:01:59 -07:00
Wale Ogunwale
d5418a231b Merge "Fix deadlock when create alert window notification" into oc-dev
am: 678477b383

Change-Id: I2c6149881b738777ed309209538c5d9726d36c36
2017-06-09 13:15:38 +00:00
Wale Ogunwale
678477b383 Merge "Fix deadlock when create alert window notification" into oc-dev 2017-06-09 13:07:18 +00:00
Bryce Lee
cbf1bd40ea Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am: ac56b8adde

Change-Id: I78c8fc62d4050546896262245785084fd5cab609
2017-06-09 11:18:04 +00:00
Bryce Lee
ac56b8adde Merge "Prioritize reused activity's stack over computed stack." into oc-dev 2017-06-09 11:11:17 +00:00
Romain Guy
c025347cf2 Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev 2017-06-09 06:34:42 +00:00
Sungsoo
39f479fe7e 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
2017-06-09 13:55:48 +09:00
Selim Cinek
4ab7b364a5 Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am: dc66506f0a

Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed
2017-06-09 04:36:31 +00:00
Selim Cinek
f62145a41a Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am: b9eb205bd7

Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21
2017-06-09 04:30:47 +00:00
Selim Cinek
dc66506f0a Merge "Fixed an issue where the notification could stay userlocked" into oc-dev 2017-06-09 04:25:42 +00:00
Selim Cinek
b9eb205bd7 Merge "Fixed a bug where systemui could crash while cloning" into oc-dev 2017-06-09 04:22:06 +00:00
Jorim Jaggi
9f23608173 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am: d1f55f6302

Change-Id: Ibbb9214593ee1b5dd51a0b0da8815c270b875257
2017-06-09 04:15:12 +00:00
Jorim Jaggi
e7a5369ab4 Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am: 713ad88afe

Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039
2017-06-09 04:11:31 +00:00
Jorim Jaggi
d1f55f6302 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev 2017-06-09 04:06:43 +00:00
Jorim Jaggi
713ad88afe Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev 2017-06-09 04:05:38 +00:00
Romain Guy
8ab1b6f8bc Fix CTS : BitmapRGBAF16Test#testSetPixel failure
Don't grab a pointer to a temporary object on the stack!

Bug: 62458021
Test: CtsGraphicsTestCase
Change-Id: Ic9662e76c9064b3f3af6f8a4534d2ef56f9c5eea
2017-06-08 18:24:25 -07:00
Adrian Roos
63f23f8dd7 Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev 2017-06-09 00:38:42 +00:00
Jorim Jaggi
34a0cdb98e Properly run window animations at vsync-sf (1/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it

Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug: 36631902
Change-Id: I988ae25645effc3ac20efa7cb9b68f23444da0d0
2017-06-08 17:22:43 -07:00
Jakub Pawlowski
25278b0197 Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am: 556b10a4e6

Change-Id: I9477ac6e3990a4e2db4a8254f11702b1557591f3
2017-06-09 00:03:31 +00:00
Wale Ogunwale
4cd3f5c519 Fix deadlock when create alert window notification
Don't hold WM lock when calling into notification manager which
can call into activity manager.

Test: Make sure alert window notification is displayed
Change-Id: Id8831878093f8079f815a830ff8acdfad99d48cb
Fixes: 62458061
2017-06-08 16:51:48 -07:00
Jakub Pawlowski
556b10a4e6 Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev 2017-06-08 23:51:27 +00:00
Matthew Ng
afa235e444 Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37
2017-06-08 23:25:36 +00:00
Jason Monk
98bf8ba30c Add notification listener plugin hook
Allows plugin control over notifications right at the entrance
to sysui and gives them the opportunity to mess with them how
they see fit.

Test: manual
Change-Id: I569bf37138da66d0524acecfa36ceb409f98fbb4
2017-06-08 19:23:11 -04:00
TreeHugger Robot
008e620153 Merge "Fixes the animation and state when docking a task by drag" into oc-dev 2017-06-08 23:21:11 +00:00
Bill Yi
4ec78fa17b Merge "Import translations. DO NOT MERGE" into oc-dev
am: dd5886bc5b  -s ours

Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f
2017-06-08 23:15:04 +00:00
Bill Yi
95657195ca Merge "Import translations. DO NOT MERGE" into oc-dev
am: 67a947b636  -s ours

Change-Id: If19e88be06d1d63955c7213c95dff59056a86c88
2017-06-08 23:12:30 +00:00
Bill Yi
dd5886bc5b Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-08 23:04:57 +00:00
Bill Yi
67a947b636 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-08 23:04:00 +00:00
Jorim Jaggi
245281c056 Boost android.anim and wm lock sections to -10 during transition
-4 is not enough if we have to compete against RT and main thread
from top app that have -10. Boost it more during app transitions

Test: Inspect systrace, make sure priorities are right, including
getting reset after the transition.
Test: Open Chrome 100x
Test: go/wm-smoke

Change-Id: Id6b060b8aafded67b4bae61b6e8960e37976b096
Fixes: 36631902
2017-06-08 15:57:44 -07:00
Bill Yi
041f0dce8a Merge "Import translations. DO NOT MERGE" into oc-dev
am: 75b5199e9d  -s ours

Change-Id: Ic7b1e9095cf413bd0401bd8d3cdfc469dd915988
2017-06-08 22:41:45 +00:00
Bill Yi
75b5199e9d Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-08 22:34:40 +00:00
Adam Lesinski
adca091fcd Merge "Revert "always adjust per-user application info"" into oc-dev
am: 887544e100

Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d
2017-06-08 21:20:03 +00:00
Adam Lesinski
887544e100 Merge "Revert "always adjust per-user application info"" into oc-dev 2017-06-08 21:14:09 +00:00
Adam Lesinski
157be6ead8 Revert "always adjust per-user application info"
This reverts commit e0046cecb0.

Reason for revert: Regresses UI theme

Bug: 62445682
Bug: 36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e
2017-06-08 21:10:52 +00:00
Jakub Pawlowski
dbf5a0a20b Bluetooth: fix connectGatt overload invocations
Merged-In: I726252e85e78bff2c9585332d2748a0d92a9f6d3
Test: sl4a GattOverBrEdrTest
Bug: 62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
2017-06-08 21:01:24 +00:00