OSDN Git Service
sergeyv [Thu, 3 Nov 2016 17:00:32 +0000 (10:00 -0700)]
Reference ctable when adopting pointer in Bitmap
Change-Id: I56aea10928f0ec73756ed055488a3e3516a9096e
Test: manual.
bug:
32621254,
32561595
Fyodor Kupolov [Wed, 2 Nov 2016 16:57:02 +0000 (16:57 +0000)]
Merge "Reuse single AssetManager for lite/full parses"
Sunny Goyal [Wed, 2 Nov 2016 16:46:38 +0000 (16:46 +0000)]
Merge "Avoding writing ApplicationInfo multiple times for nested RemoteViews"
Fyodor Kupolov [Wed, 2 Nov 2016 16:44:09 +0000 (16:44 +0000)]
Merge "Do not exclude partial users that are not being removed"
Shuo Gao [Wed, 2 Nov 2016 16:19:34 +0000 (16:19 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours am:
2e40559326 -s ours am:
2aa15664af -s ours
am:
9750c9b171 -s ours
Change-Id: I341568e08774d95db757bf1303d75debdc6a6ef6
Thomas Buhot [Wed, 2 Nov 2016 16:18:16 +0000 (16:18 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours am:
a71a6ec8fb -s ours am:
a682048141 -s ours
am:
6d69a1668f -s ours
Change-Id: Ide03b46a8a163f1c451b8e29c395aab07420411c
Shuo Gao [Wed, 2 Nov 2016 16:13:46 +0000 (16:13 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours am:
2e40559326 -s ours
am:
2aa15664af -s ours
Change-Id: I551a90774c523e4c27c87a4f804d2562490ca41a
Thomas Buhot [Wed, 2 Nov 2016 16:12:46 +0000 (16:12 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours am:
a71a6ec8fb -s ours
am:
a682048141 -s ours
Change-Id: I1e78b118ee1f4d4551558399b3cd2e9960270594
Shuo Gao [Wed, 2 Nov 2016 16:07:59 +0000 (16:07 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours am:
e319e7335c -s ours
am:
2e40559326 -s ours
Change-Id: I7e74e80dabc62b2270628848b52b559999d05189
Thomas Buhot [Wed, 2 Nov 2016 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours am:
5e089ad195 -s ours
am:
a71a6ec8fb -s ours
Change-Id: Ib8cba8d490f9777628108b56a6a3a81582c2a483
Shuo Gao [Wed, 2 Nov 2016 16:03:00 +0000 (16:03 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours
am:
e319e7335c -s ours
Change-Id: I848f238db11bc2f67fec83cb157d3cb3faec0212
Thomas Buhot [Wed, 2 Nov 2016 16:02:09 +0000 (16:02 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours
am:
5e089ad195 -s ours
Change-Id: I0062bfb72567ae43dbf50a1127e22b2363cac9e1
Shuo Gao [Wed, 2 Nov 2016 15:57:25 +0000 (15:57 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours
am:
90c736f892 -s ours
Change-Id: I38668b4a372530962a0ae0d6e2a717319731dff0
Thomas Buhot [Wed, 2 Nov 2016 15:56:38 +0000 (15:56 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours
am:
eae299874c -s ours
Change-Id: I6a8b5337f38b099bee806451db1df44c723e6596
Shuo Gao [Wed, 2 Nov 2016 15:51:17 +0000 (15:51 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours
am:
41bdd3a668 -s ours
Change-Id: I70baae78d036713c95c02e9cad497a343d5d1309
Thomas Buhot [Wed, 2 Nov 2016 15:50:38 +0000 (15:50 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours
am:
40d2aa1edc -s ours
Change-Id: I741b9682b066384aadce0dcaf9ca792de015d59e
Shuo Gao [Wed, 2 Nov 2016 15:46:36 +0000 (15:46 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours
am:
eb3696542a -s ours
Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc
Thomas Buhot [Wed, 2 Nov 2016 15:45:43 +0000 (15:45 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours
am:
7b43f2af93 -s ours
Change-Id: Ia6804a8b93168a033075b6e77ac5d1bec63e3d69
Shuo Gao [Wed, 2 Nov 2016 15:41:06 +0000 (15:41 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am:
1b5d5bd119 -s ours
Change-Id: I6c218970581361c195471ee435f5a91b109911f0
Thomas Buhot [Wed, 2 Nov 2016 15:40:34 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
am:
80e6d8873b -s ours
Change-Id: I521a8a64510e89ee97578fc5e2f600b4a1851bd3
Geoffrey Pitsch [Wed, 2 Nov 2016 14:58:22 +0000 (14:58 +0000)]
Merge "Move notification tests into separate APK."
Bill Yi [Wed, 2 Nov 2016 13:27:45 +0000 (13:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours am:
3b99360472 -s ours am:
77323eb2bd -s ours
am:
f38a9f357a -s ours
Change-Id: I71da3d656c18fd3f567d61f38ba40e2df5b97ba1
Bill Yi [Wed, 2 Nov 2016 13:26:51 +0000 (13:26 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours am:
1aa04e8cae -s ours am:
70d5453b63 -s ours
am:
12bc7f28ad -s ours
Change-Id: I6ad9b8b0cb2cde89db344981e39ce92a745d0d14
Bill Yi [Wed, 2 Nov 2016 13:21:09 +0000 (13:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ba7f49030 -s ours am:
80914e10e5 -s ours
am:
c850e6cdac -s ours
Change-Id: I8e4922f0d2a04054a8d163ffa2888e129f803fcc
Bill Yi [Wed, 2 Nov 2016 13:20:19 +0000 (13:20 +0000)]
Import translations. DO NOT MERGE am:
6fb3b77745 -s ours am:
9e7ac87d08 -s ours
am:
ddb3a08aba -s ours
Change-Id: Iea3c6ec39fbd0c3e6454f6068aafe154de073155
Nimrod Gileadi [Wed, 2 Nov 2016 13:19:26 +0000 (13:19 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am:
523c4fd695 am:
2c2abe6db3
am:
b633e4402f
Change-Id: I6fae8a123c7528853fc66f90970cc9cee15be227
Nimrod Gileadi [Wed, 2 Nov 2016 13:18:36 +0000 (13:18 +0000)]
Increment a MetricsLogger counter on back press. am:
580135c1b8 am:
51ac3a911c
am:
a774e10aec
Change-Id: Ia3f485d5eb05c9700d8ae612dea069b97de7bf11
Geoffrey Pitsch [Tue, 1 Nov 2016 17:38:22 +0000 (13:38 -0400)]
Move notification tests into separate APK.
This will allow us to hook into a presubmit step without
bringing in the other tests.
Compile notification source directly into test APK, for
faster development.
Test: runtest --path
frameworks/base/services/tests/notification/
Change-Id: I04dbcec892cbd375ba1334f59e6b58bcafe80151
Bill Yi [Wed, 2 Nov 2016 13:16:30 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours am:
3b99360472 -s ours
am:
77323eb2bd -s ours
Change-Id: Ib7e45076dda50cf23ee25743605480c58682af43
Bill Yi [Wed, 2 Nov 2016 13:15:36 +0000 (13:15 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours am:
1aa04e8cae -s ours
am:
70d5453b63 -s ours
Change-Id: Ide7da0fea22b8e7af33a4cecfa7b73264a65846b
Bill Yi [Wed, 2 Nov 2016 13:13:19 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ba7f49030 -s ours
am:
80914e10e5 -s ours
Change-Id: If559097d398446f5f2f8181ac608c6458c099fb2
Bill Yi [Wed, 2 Nov 2016 13:12:25 +0000 (13:12 +0000)]
Import translations. DO NOT MERGE am:
6fb3b77745 -s ours
am:
9e7ac87d08 -s ours
Change-Id: Icc870fda386710dc570c0c9846b4eba8cf9d47fb
Nimrod Gileadi [Wed, 2 Nov 2016 13:11:33 +0000 (13:11 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am:
523c4fd695
am:
2c2abe6db3
Change-Id: I478872bddc9526e8477bd1a0ed7ef816e691d3d7
Bill Yi [Wed, 2 Nov 2016 13:11:18 +0000 (13:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
125deebf5d -s ours
am:
3b99360472 -s ours
Change-Id: I3645f4da4f27625faad83dddb191b16a196aeea7
Nimrod Gileadi [Wed, 2 Nov 2016 13:10:36 +0000 (13:10 +0000)]
Increment a MetricsLogger counter on back press. am:
580135c1b8
am:
51ac3a911c
Change-Id: I0b65ca68a743828fa47efd6793c5873cbc9b74a9
Bill Yi [Wed, 2 Nov 2016 13:10:22 +0000 (13:10 +0000)]
Import translations. DO NOT MERGE am:
7d24dd6448 -s ours
am:
1aa04e8cae -s ours
Change-Id: I0957749f702aa34c7ef447e4995e2ae23e1748a1
Bill Yi [Wed, 2 Nov 2016 13:08:32 +0000 (13:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
f750173bf1 -s ours
am:
015687b026 -s ours
Change-Id: Id92fa9ff612c16f45cd20978b53f81adf85ef6f1
Bill Yi [Wed, 2 Nov 2016 13:07:29 +0000 (13:07 +0000)]
Import translations. DO NOT MERGE am:
212cda9a9a -s ours
am:
e2dac2cd85 -s ours
Change-Id: I2ae406406b26f10c863eda8338e1c68da30754b7
Bill Yi [Wed, 2 Nov 2016 13:04:36 +0000 (13:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ba7f49030 -s ours
Change-Id: I2786876548e79632ff8aae52cd058ba4eaa57895
Bill Yi [Wed, 2 Nov 2016 13:04:35 +0000 (13:04 +0000)]
Import translations. DO NOT MERGE
am:
6fb3b77745 -s ours
Change-Id: Id6c5d0487f362fed25ddf6379f44db9b2ad60a1c
Nimrod Gileadi [Wed, 2 Nov 2016 13:03:07 +0000 (13:03 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
am:
523c4fd695
Change-Id: I2928fafd79f08500c7369691985f6b8b726433c1
Bill Yi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
125deebf5d -s ours
Change-Id: Ic90df3a0db800052813e23370e1b80846caae456
Nimrod Gileadi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]
Increment a MetricsLogger counter on back press.
am:
580135c1b8
Change-Id: I29fb7f03b5da8edf3643118bc74bba553f2f6ca1
Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f750173bf1 -s ours
Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d
Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]
Import translations. DO NOT MERGE
am:
7d24dd6448 -s ours
Change-Id: Iadd9f2dcec4c026a70aa5169325a6d3e42d15460
Bill Yi [Wed, 2 Nov 2016 13:03:00 +0000 (13:03 +0000)]
Import translations. DO NOT MERGE
am:
212cda9a9a -s ours
Change-Id: I327873e50179cc0e48712ce95b855ddf9f935aae
TreeHugger Robot [Wed, 2 Nov 2016 12:58:36 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 2 Nov 2016 12:58:12 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:57:31 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:57:03 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:56:18 +0000 (12:56 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 2 Nov 2016 12:55:14 +0000 (12:55 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
Hugo Benichi [Wed, 2 Nov 2016 12:35:45 +0000 (12:35 +0000)]
Merge "ApfTest: tag tests with @SmallTest or @MediumTest"
TreeHugger Robot [Wed, 2 Nov 2016 12:13:27 +0000 (12:13 +0000)]
Merge "Cross profile candidate should be considered"
TreeHugger Robot [Wed, 2 Nov 2016 10:35:25 +0000 (10:35 +0000)]
Merge "[DPM] DO can start network logging and listen for events"
Tony Mak [Wed, 2 Nov 2016 10:26:45 +0000 (10:26 +0000)]
Cross profile candidate should be considered
Bug:
32547783
Fixed the regression introduced in ag/
1243573
Test: Manual test - Open a map link in work calendar, personal map is shown as an option.
Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
Tony Mak [Tue, 1 Nov 2016 18:12:10 +0000 (18:12 +0000)]
Add javadoc for profileGroupId
According to the implementation of getProfileParent,
profileGroupId == parent user id.
And we have already assumed this is true in some part of code in DPMS.
Test: Javadocs change
Change-Id: Ie48fdf24fb0428d4ee3f09bed2ac26cb17e1ced9
Michal Karpinski [Wed, 12 Oct 2016 13:59:26 +0000 (14:59 +0100)]
[DPM] DO can start network logging and listen for events
This CL adds:
1) Setter and getter in DPM to manipulate logging switch (retrieval
method to come in a subsequent CL(s)).
2) A way for DPM to register to listen for events.
3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).
Bug:
29748723
Change-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47
Bill Yi [Wed, 2 Nov 2016 06:30:37 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2c811c3ef881581b47d410c916e43160e6d60a53
Auto-generated-cl: translation import
Hugo Benichi [Wed, 2 Nov 2016 04:43:22 +0000 (13:43 +0900)]
ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.
Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.
Test: ApfTest passes ($runtest frameworks-net)
Bug:
31479480
Change-Id: Iae28fc30b6229a161388233c40863f38b902991d
TreeHugger Robot [Wed, 2 Nov 2016 05:18:26 +0000 (05:18 +0000)]
Merge "Add findPath method to MtpDocumentsProvider."
Daichi Hirono [Tue, 1 Nov 2016 09:41:43 +0000 (18:41 +0900)]
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
Bill Yi [Wed, 2 Nov 2016 02:34:21 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b2c1dbb250552bbd446e51b38be6b9508d2bf0c
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 2 Nov 2016 02:14:12 +0000 (02:14 +0000)]
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)
Yorke Lee [Wed, 2 Nov 2016 01:38:49 +0000 (01:38 +0000)]
Merge "Add a config flag to control app transitions"
Sanket Agarwal [Wed, 2 Nov 2016 01:27:13 +0000 (01:27 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e am:
f41abccf80 am:
5e8b2e4110
am:
15c21c616e
Change-Id: I15a7590c66fed5061ead0046e0773454911a43aa
Joseph Pirozzo [Wed, 2 Nov 2016 01:26:01 +0000 (01:26 +0000)]
MAP MCE am:
b8fc0679e8 am:
b13240028b am:
5602b26f41
am:
132dab26e5
Change-Id: Icb6d7db9d0e1866b2c1847be2b1da0008bd8185d
Joseph Pirozzo [Wed, 2 Nov 2016 01:25:15 +0000 (01:25 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb am:
a31933abc3 am:
1c21f0378a
am:
89c1087162
Change-Id: I879ec1f919386efb433d21e2bc7088e3ed31f4ce
Joseph Pirozzo [Wed, 2 Nov 2016 01:24:14 +0000 (01:24 +0000)]
MAP MCE am:
631768d814 am:
d94c280a7f am:
c412914520
am:
fb70d77f64
Change-Id: Ia56f6ca01a4d92b24f192102917950a10b6cb05d
Julia Reynolds [Wed, 2 Nov 2016 01:20:17 +0000 (01:20 +0000)]
Merge "Some channel model updates"
Sanket Agarwal [Wed, 2 Nov 2016 01:19:29 +0000 (01:19 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e am:
f41abccf80
am:
5e8b2e4110
Change-Id: I481283466c74087e4075cbda52f99fa94deae8c6
Joseph Pirozzo [Wed, 2 Nov 2016 01:18:38 +0000 (01:18 +0000)]
MAP MCE am:
b8fc0679e8 am:
b13240028b
am:
5602b26f41
Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c
Joseph Pirozzo [Wed, 2 Nov 2016 01:17:45 +0000 (01:17 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb am:
a31933abc3
am:
1c21f0378a
Change-Id: I367eea86cd82017a8c8a9e2922ac5a9580159b96
Joseph Pirozzo [Wed, 2 Nov 2016 01:16:45 +0000 (01:16 +0000)]
MAP MCE am:
631768d814 am:
d94c280a7f
am:
c412914520
Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584
Sanket Agarwal [Wed, 2 Nov 2016 01:11:53 +0000 (01:11 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e
am:
f41abccf80
Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0
Joseph Pirozzo [Wed, 2 Nov 2016 01:11:04 +0000 (01:11 +0000)]
MAP MCE am:
b8fc0679e8
am:
b13240028b
Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
Joseph Pirozzo [Wed, 2 Nov 2016 01:10:02 +0000 (01:10 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb
am:
a31933abc3
Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
Joseph Pirozzo [Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)]
MAP MCE am:
631768d814
am:
d94c280a7f
Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
Sanket Agarwal [Wed, 2 Nov 2016 01:05:20 +0000 (01:05 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am:
cf4dc9236e
Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401
Joseph Pirozzo [Wed, 2 Nov 2016 01:05:14 +0000 (01:05 +0000)]
MAP MCE
am:
b8fc0679e8
Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
Joseph Pirozzo [Wed, 2 Nov 2016 01:04:33 +0000 (01:04 +0000)]
Pbap disconnect durring connect
am:
a4f0127fbb
Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
Joseph Pirozzo [Wed, 2 Nov 2016 01:03:51 +0000 (01:03 +0000)]
MAP MCE
am:
631768d814
Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
Bill Yi [Wed, 2 Nov 2016 00:57:21 +0000 (17:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief73e3fee1a3f44096c534437fd74b357a2dde8a
Auto-generated-cl: translation import
Sanket Agarwal [Wed, 2 Nov 2016 00:55:40 +0000 (00:55 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
* changes:
MAP MCE
Pbap disconnect durring connect
MAP MCE
Adrian Roos [Wed, 2 Nov 2016 00:54:46 +0000 (00:54 +0000)]
Merge "DozeService: Fixup nits from review"
Fyodor Kupolov [Wed, 2 Nov 2016 00:54:04 +0000 (00:54 +0000)]
Merge "Initialize daemon on a separate thread"
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:49:44 +0000 (00:49 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7 am:
4c65d49a92 am:
de915e3ade
am:
d771ca3871
Change-Id: I9bf6a015e90e3e259897ca0b4ff29c69e13feae6
Bill Yi [Wed, 2 Nov 2016 00:45:25 +0000 (17:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22df3420e521f99e68d025264954a102f14990df
Auto-generated-cl: translation import
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:44:47 +0000 (00:44 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7 am:
4c65d49a92
am:
de915e3ade
Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7
am:
4c65d49a92
Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
Joseph Pirozzo [Thu, 6 Oct 2016 18:44:53 +0000 (11:44 -0700)]
MAP MCE
Fix @LINK to @link in javadoc.
Bug:
30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit
f5fba751d360bbe8294c4640f5ad12a990f13122)
Joseph Pirozzo [Mon, 2 May 2016 14:30:21 +0000 (07:30 -0700)]
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)
Joseph Pirozzo [Thu, 1 Sep 2016 21:19:28 +0000 (14:19 -0700)]
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)
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:34:47 +0000 (00:34 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
am:
7f64c195f7
Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
TreeHugger Robot [Wed, 2 Nov 2016 00:29:22 +0000 (00:29 +0000)]
Merge "Revert "Exit enteringAccessoryMode when entered.""
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:24:06 +0000 (00:24 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
Fyodor Kupolov [Wed, 2 Nov 2016 00:18:41 +0000 (17:18 -0700)]
Do not exclude partial users that are not being removed
Otherwise maxSupportedUsers limit can be exceeded by creating users in
parallel.
Test: Manual cmd line + UI guest create/switch/remove + UserManagerTest
Bug:
32485535
Change-Id: I490a70501f3643980bbfb1c95940b9ae3f20ccee
Bill Yi [Wed, 2 Nov 2016 00:18:13 +0000 (17:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1e32a6765f35a781a05e767a219399ec159fddc
Auto-generated-cl: translation import
Dianne Hackborn [Wed, 2 Nov 2016 00:11:26 +0000 (00:11 +0000)]
Merge "Switch am command to go through "cmd activity"."
Yorke Lee [Mon, 31 Oct 2016 19:31:06 +0000 (12:31 -0700)]
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
OSDN Git Service
