Commit Graph

294722 Commits

Author SHA1 Message Date
TreeHugger Robot
c4e678e7df Merge "Add findPath method to MtpDocumentsProvider." 2016-11-02 05:18:29 +00:00
Daichi Hirono
b9ffa2a1d2 Add findPath method to MtpDocumentsProvider.
Bug: 32515515
Test: adb shell am instrument -w -e class com.android.mtp.MtpDocumentsProviderTest com.android.mtp.tests/com.android.mtp.TestResultInstrumentation
Change-Id: Ib87e8f5258de8fd48a099adbf077b3b9ff85773c
2016-11-02 12:33:45 +09:00
Jorim Jaggi
5974b4df49 Merge changes from topic 'keyguard_refactor'
* changes:
  The big keyguard transition refactor (6/n)
  The big keyguard transition refactor (5/n)
  The big keyguard transition refactor (4/n)
  The big keyguard transition refactor (3/n)
  The big keyguard transition refactor (2/n)
  The big keyguard transition refactor (1/n)
2016-11-02 02:14:15 +00:00
Yorke Lee
ce55e84315 Merge "Add a config flag to control app transitions" 2016-11-02 01:38:52 +00:00
Sanket Agarwal
a4447cc1b6 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e am: f41abccf80 am: 5e8b2e4110
am: 15c21c616e

Change-Id: I15a7590c66fed5061ead0046e0773454911a43aa
2016-11-02 01:27:13 +00:00
Joseph Pirozzo
22eedd9073 MAP MCE am: b8fc0679e8 am: b13240028b am: 5602b26f41
am: 132dab26e5

Change-Id: Icb6d7db9d0e1866b2c1847be2b1da0008bd8185d
2016-11-02 01:26:01 +00:00
Joseph Pirozzo
d53cdd2b6d Pbap disconnect durring connect am: a4f0127fbb am: a31933abc3 am: 1c21f0378a
am: 89c1087162

Change-Id: I879ec1f919386efb433d21e2bc7088e3ed31f4ce
2016-11-02 01:25:15 +00:00
Joseph Pirozzo
fe9368afe8 MAP MCE am: 631768d814 am: d94c280a7f am: c412914520
am: fb70d77f64

Change-Id: Ia56f6ca01a4d92b24f192102917950a10b6cb05d
2016-11-02 01:24:14 +00:00
Julia Reynolds
73481c8837 Merge "Some channel model updates" 2016-11-02 01:20:20 +00:00
Sanket Agarwal
15c21c616e Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e am: f41abccf80
am: 5e8b2e4110

Change-Id: I481283466c74087e4075cbda52f99fa94deae8c6
2016-11-02 01:19:29 +00:00
Joseph Pirozzo
132dab26e5 MAP MCE am: b8fc0679e8 am: b13240028b
am: 5602b26f41

Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c
2016-11-02 01:18:38 +00:00
Joseph Pirozzo
89c1087162 Pbap disconnect durring connect am: a4f0127fbb am: a31933abc3
am: 1c21f0378a

Change-Id: I367eea86cd82017a8c8a9e2922ac5a9580159b96
2016-11-02 01:17:45 +00:00
Joseph Pirozzo
fb70d77f64 MAP MCE am: 631768d814 am: d94c280a7f
am: c412914520

Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584
2016-11-02 01:16:45 +00:00
Sanket Agarwal
5e8b2e4110 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e
am: f41abccf80

Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0
2016-11-02 01:11:53 +00:00
Joseph Pirozzo
5602b26f41 MAP MCE am: b8fc0679e8
am: b13240028b

Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
2016-11-02 01:11:04 +00:00
Joseph Pirozzo
1c21f0378a Pbap disconnect durring connect am: a4f0127fbb
am: a31933abc3

Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
2016-11-02 01:10:02 +00:00
Joseph Pirozzo
c412914520 MAP MCE am: 631768d814
am: d94c280a7f

Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
2016-11-02 01:09:14 +00:00
Sanket Agarwal
f41abccf80 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am: cf4dc9236e

Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401
2016-11-02 01:05:20 +00:00
Joseph Pirozzo
b13240028b MAP MCE
am: b8fc0679e8

Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
2016-11-02 01:05:14 +00:00
Joseph Pirozzo
a31933abc3 Pbap disconnect durring connect
am: a4f0127fbb

Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
2016-11-02 01:04:33 +00:00
Joseph Pirozzo
d94c280a7f MAP MCE
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
2016-11-02 01:03:51 +00:00
Sanket Agarwal
cf4dc9236e Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
* changes:
  MAP MCE
  Pbap disconnect durring connect
  MAP MCE
2016-11-02 00:55:40 +00:00
Adrian Roos
6154da805a Merge "DozeService: Fixup nits from review" 2016-11-02 00:54:49 +00:00
Fyodor Kupolov
0624b7b164 Merge "Initialize daemon on a separate thread" 2016-11-02 00:54:07 +00:00
Tomasz Mikolajewski
1a9acd63ed Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92 am: de915e3ade
am: d771ca3871

Change-Id: I9bf6a015e90e3e259897ca0b4ff29c69e13feae6
2016-11-02 00:49:44 +00:00
Tomasz Mikolajewski
d771ca3871 Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92
am: de915e3ade

Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa
2016-11-02 00:44:47 +00:00
Tomasz Mikolajewski
de915e3ade Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7
am: 4c65d49a92

Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
2016-11-02 00:39:45 +00:00
Joseph Pirozzo
b8fc0679e8 MAP MCE
Fix @LINK to @link in javadoc.

Bug: 30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit f5fba751d360bbe8294c4640f5ad12a990f13122)
2016-11-01 17:39:16 -07:00
Joseph Pirozzo
a4f0127fbb Pbap disconnect durring connect
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.

bug: 28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit bdd24942e47811ffe6bb9814934e6b08a8190e7e)
2016-11-01 17:39:16 -07:00
Joseph Pirozzo
631768d814 MAP MCE
Add MAP client code into packages/apps/Bluetooth.  Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).

Bug: 30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit 433b3054847951e8e7b3864d11990604a66b8651)
2016-11-01 17:39:16 -07:00
Tomasz Mikolajewski
4c65d49a92 Merge "Add support for opening JAR/ZIP files via FD."
am: 7f64c195f7

Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
2016-11-02 00:34:47 +00:00
TreeHugger Robot
9717839a1f Merge "Revert "Exit enteringAccessoryMode when entered."" 2016-11-02 00:29:27 +00:00
Tomasz Mikolajewski
7f64c195f7 Merge "Add support for opening JAR/ZIP files via FD." 2016-11-02 00:24:07 +00:00
Dianne Hackborn
2e8288f450 Merge "Switch am command to go through "cmd activity"." 2016-11-02 00:11:28 +00:00
Yorke Lee
044e2aef39 Add a config flag to control app transitions
Bug: 32289964
Test: Build and verify that app transitions still work
and can be controlled by overlay

Cherry-picked from I78e88c4e7d3c32493c11be451b0c5ca59f68be83
Change-Id: I78e88c4e7d3c32493c11be451b0c5ca59f68be83
2016-11-01 16:48:28 -07:00
Bryce Lee
fb4af44d0c Merge "Add a way to query for supported Bluetooth profiles." am: 0a86c936a6 am: 6f84631d8d am: e07c4cb4e6
am: 7f60047cb4

Change-Id: Icaff5bab21f5a9a40f7c24b13e8579d390a373d9
2016-11-01 23:34:48 +00:00
Bryce Lee
7f60047cb4 Merge "Add a way to query for supported Bluetooth profiles." am: 0a86c936a6 am: 6f84631d8d
am: e07c4cb4e6

Change-Id: I53a4a3df08b8bd169112d004f7fa6ab5495c15fe
2016-11-01 23:29:16 +00:00
TreeHugger Robot
7bb566c63d Merge "Removing forced layout when the window is translated." 2016-11-01 23:28:18 +00:00
Bryce Lee
e07c4cb4e6 Merge "Add a way to query for supported Bluetooth profiles." am: 0a86c936a6
am: 6f84631d8d

Change-Id: I8d9bce44587a1740f0acbd09552baf7d8b6990a5
2016-11-01 23:24:42 +00:00
Bryce Lee
6f84631d8d Merge "Add a way to query for supported Bluetooth profiles."
am: 0a86c936a6

Change-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c
2016-11-01 23:20:16 +00:00
Phil Weaver
a2a6494fb8 Don't invalidate list data during layout. am: 456158ffc2 am: 06ffff6132 am: 07f434d02f
am: 112345c1c3

Change-Id: I367cf7cb5e24d6f2c7724db4e6038830003e2029
2016-11-01 23:17:15 +00:00
vinodkrishnan
a2d96e0ed9 Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev am: 89e653ccc7 am: 2a569d1490
am: f4f48fc5f9  -s ours

Change-Id: I434e3e403c96c46cb5f002ac96d33350d337a72f
2016-11-01 23:13:25 +00:00
Vinod Krishnan
f310dc2925 DO NOT MERGE Wear Fwk: Disable Animations for A11y am: 8500f26d51 am: 305187983b
am: 166b0ad28f  -s ours

Change-Id: Ica85275f5ae09408da727821788c1d502eb47057
2016-11-01 23:12:36 +00:00
Treehugger Robot
0a86c936a6 Merge "Add a way to query for supported Bluetooth profiles." 2016-11-01 23:12:22 +00:00
Phil Weaver
112345c1c3 Don't invalidate list data during layout. am: 456158ffc2 am: 06ffff6132
am: 07f434d02f

Change-Id: I6adaa881b70805d46d2425dd979609c6e99e11c9
2016-11-01 23:09:02 +00:00
vinodkrishnan
f4f48fc5f9 Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev am: 89e653ccc7
am: 2a569d1490

Change-Id: I6b3e73ca5ff71dbc22f4ee510fa944aaa7eb4464
2016-11-01 23:05:53 +00:00
Vinod Krishnan
166b0ad28f DO NOT MERGE Wear Fwk: Disable Animations for A11y am: 8500f26d51
am: 305187983b

Change-Id: Ifb4eea689ded623034d5f8aa3158c814620e9de9
2016-11-01 23:04:59 +00:00
Phil Weaver
07f434d02f Don't invalidate list data during layout. am: 456158ffc2
am: 06ffff6132

Change-Id: I56cd58a077729b7a8fccb66aeea5e3d69cb2fcdf
2016-11-01 22:59:27 +00:00
vinodkrishnan
2a569d1490 Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev
am: 89e653ccc7

Change-Id: Id38b4d4b7240ff3e241811d58e56c7cc732ce637
2016-11-01 22:58:04 +00:00
Vinod Krishnan
305187983b DO NOT MERGE Wear Fwk: Disable Animations for A11y
am: 8500f26d51

Change-Id: I8bddbad4b8777a3fedac2f88717b48d00f596a8c
2016-11-01 22:57:58 +00:00