OSDN Git Service
Mark Lu [Mon, 26 Sep 2016 17:22:45 +0000 (17:22 +0000)]
docs: Update docs for SQLiteDatabase replace methods
am:
1e20208d90
Change-Id: I8222fae7025d5a546b0b3d6b0ebbb7abae66ba8b
Mark Lu [Mon, 26 Sep 2016 17:21:10 +0000 (17:21 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev
am:
537481e2c3
Change-Id: Iab4f3930c44319d1adba37b3798d133c57763102
Hemal Patel [Mon, 26 Sep 2016 17:21:04 +0000 (17:21 +0000)]
Fixed a typo in the code sample
am:
247d1c9ea8
Change-Id: Ic07c17c95e29ce916e2cde22cbb0ce797f8c65fe
Mark Lu [Mon, 26 Sep 2016 17:11:54 +0000 (17:11 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev
Etan Cohen [Mon, 26 Sep 2016 16:53:04 +0000 (16:53 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only" am:
e1513a8cc6
am:
f95a3703c1
Change-Id: Ic271ac809add1ac66b468ee337f2838e2a008cdc
Etan Cohen [Mon, 26 Sep 2016 16:48:39 +0000 (16:48 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only"
am:
e1513a8cc6
Change-Id: I71c367bdeb395e330d57252bc77c9817e8870fb5
Etan Cohen [Mon, 26 Sep 2016 16:40:52 +0000 (16:40 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only"
Josh Horwich [Mon, 26 Sep 2016 15:31:53 +0000 (15:31 +0000)]
Merge "Docs: Fix missing space" into nyc-dev
am:
fd0a31c0aa
Change-Id: Ie1541b1ba2747d888b5b9dd0479a250aa80d02e7
Josh Horwich [Mon, 26 Sep 2016 15:31:48 +0000 (15:31 +0000)]
Docs: Fix missing space
am:
999fe148e4
Change-Id: I680a07574811450aca18036ad05a0740884363e2
TreeHugger Robot [Mon, 26 Sep 2016 15:22:54 +0000 (15:22 +0000)]
Merge "Docs: Fix missing space" into nyc-dev
Etan Cohen [Mon, 26 Sep 2016 15:05:05 +0000 (15:05 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review" am:
a7b2fff388
am:
3f1c33c7b8
Change-Id: I49da76b668005d0cc8904794c5eed155697698ef
Etan Cohen [Mon, 26 Sep 2016 14:58:37 +0000 (14:58 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"
am:
a7b2fff388
Change-Id: I2d16cebc4357a88ba44a7e209a1ddb8718516c4f
Etan Cohen [Thu, 22 Sep 2016 00:54:35 +0000 (17:54 -0700)]
[NAN] Change Broadcast for NAN status change to notification only
Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.
(cherry-pick of commit
905077a590d5b63a262d6f1f4f6e555ad9b79359)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e
Etan Cohen [Mon, 26 Sep 2016 14:48:48 +0000 (14:48 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"
Michael Wright [Mon, 26 Sep 2016 14:25:02 +0000 (14:25 +0000)]
Merge changes from topic 'aosp-generics-api' am:
fe9357f6e7
am:
98f6bbbec8
Change-Id: Iffa1f7621e298f0528dbf8d9be82c1d842982b62
Michael Wright [Mon, 26 Sep 2016 14:21:33 +0000 (14:21 +0000)]
DO NOT MERGE Track generics in API definition. am:
b4fcc6136e -s ours
am:
3d3413ea8b -s ours
Change-Id: I15ae4a6e3283be6ff9a566186210c0f50b504bfa
Dianne Hackborn [Mon, 26 Sep 2016 14:20:45 +0000 (14:20 +0000)]
DO NOT MERGE Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API am:
a0e55c43c2 -s ours
am:
85ecb3405a -s ours
Change-Id: I9444bff28f2cf6131b5aa13b84cb375181b5a9ad
Michael Wright [Mon, 26 Sep 2016 14:19:45 +0000 (14:19 +0000)]
Merge changes from topic 'aosp-generics-api'
am:
fe9357f6e7
Change-Id: Ifff5983e6c85faefa91e8ec5de4221cc715c575c
Michael Wright [Mon, 26 Sep 2016 14:14:22 +0000 (14:14 +0000)]
DO NOT MERGE Track generics in API definition.
am:
b4fcc6136e -s ours
Change-Id: Iada343936c04f2a7f3875f86c1f8c48c5a62be2b
Dianne Hackborn [Mon, 26 Sep 2016 14:13:44 +0000 (14:13 +0000)]
DO NOT MERGE Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API
am:
a0e55c43c2 -s ours
Change-Id: I15b1ff09f6c346001e89c06b45b91e92adbceae8
Treehugger Robot [Mon, 26 Sep 2016 14:04:56 +0000 (14:04 +0000)]
Merge changes from topic 'aosp-generics-api'
* changes:
DO NOT MERGE Track generics in API definition.
DO NOT MERGE Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API
Etan Cohen [Mon, 26 Sep 2016 13:11:02 +0000 (13:11 +0000)]
Merge "[NAN] Reorder parameters of send message method(s) per API review" am:
1dd012a41a
am:
a6c2aa4131
Change-Id: I2520b4d4f59b6e94c655c7769b6a02382eeae7ad
Etan Cohen [Mon, 26 Sep 2016 13:06:05 +0000 (13:06 +0000)]
Merge "[NAN] Reorder parameters of send message method(s) per API review"
am:
1dd012a41a
Change-Id: I6b32b5fde71753bed0a16250065551dc3f218f54
Etan Cohen [Wed, 21 Sep 2016 21:37:02 +0000 (14:37 -0700)]
[NAN] Remove failure reason codes from API per API review
Not all codes are actionable. Will add back if/as needed.
(cherry-pick of commit
4b47c3f5b869a5fb072b122c47bf2c9e87f582e9)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8
Etan Cohen [Mon, 26 Sep 2016 12:58:14 +0000 (12:58 +0000)]
Merge "[NAN] Reorder parameters of send message method(s) per API review"
Narayan Kamath [Mon, 26 Sep 2016 10:07:19 +0000 (10:07 +0000)]
Merge "Remove (now) unnecessary reference to core-lambda-stubs." am:
68e91852c3
am:
c1d97c9250
Change-Id: I7eb80947c4a0170af7e6af4f878f3d15c8587949
Narayan Kamath [Mon, 26 Sep 2016 10:02:48 +0000 (10:02 +0000)]
Merge "Remove (now) unnecessary reference to core-lambda-stubs."
am:
68e91852c3
Change-Id: I43ac61098a1dd8986385d61b702459c63e640c73
Treehugger Robot [Mon, 26 Sep 2016 09:55:36 +0000 (09:55 +0000)]
Merge "Remove (now) unnecessary reference to core-lambda-stubs."
Etan Cohen [Mon, 26 Sep 2016 00:26:39 +0000 (00:26 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review" am:
95abef9355
am:
c8f03c33df
Change-Id: I3bec0e3b27bea4516a73b428788c68858354eaf7
Etan Cohen [Mon, 26 Sep 2016 00:21:46 +0000 (00:21 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review"
am:
95abef9355
Change-Id: I31f34ec26776ae7168128c47cda0fc29d08c7753
Etan Cohen [Wed, 21 Sep 2016 18:53:24 +0000 (11:53 -0700)]
[NAN] Reorder parameters of send message method(s) per API review
Move messageId before message in the argument list.
(cherry-pick of commit
3da7c88425d826e1a5e662f3d8671900e2ad15e5)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123
Etan Cohen [Mon, 26 Sep 2016 00:13:42 +0000 (00:13 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review"
Dimitry Ivanov [Sat, 24 Sep 2016 22:18:20 +0000 (22:18 +0000)]
Merge "Add missing liblog dependency" am:
6a7c807d65
am:
247fe92207
Change-Id: I4f3363f8345597f4514828597cce9bbd6b0d1658
Dimitry Ivanov [Sat, 24 Sep 2016 22:14:48 +0000 (22:14 +0000)]
Merge "Add missing liblog dependency"
am:
6a7c807d65
Change-Id: Ia590e4b12de01da9a288cda8dfe730a82c319648
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:37 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 00:20:32 +0000 (17:20 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I71f402a04686b7bd6ee6adacda7b51280f5c7b92
Mark Lu [Fri, 23 Sep 2016 22:18:40 +0000 (22:18 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
am:
d91c303e6c
Change-Id: Ieaf7e14ac25bab608ec5e67d9d768aa91f97b880
Mark Lu [Fri, 23 Sep 2016 22:18:35 +0000 (22:18 +0000)]
docs: update javadoc description for View.setVisibility() method
am:
ae0459f532
Change-Id: I3c9d70fc6fc2b6770076454cdfbb1ed1b619dfb9
Mark Lu [Fri, 23 Sep 2016 22:17:05 +0000 (22:17 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev
am:
dc24613bf3
Change-Id: I4a9b85554ee2a744adda9f3e4bc3d76788d7d3c1
Mark Lu [Fri, 23 Sep 2016 22:17:00 +0000 (22:17 +0000)]
docs: update docs for uses-feature element
am:
b463a6db08
Change-Id: I82dbfdda1c642016ed63d95f77ee69aebc08d25f
Mark Lu [Fri, 23 Sep 2016 22:15:13 +0000 (22:15 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
am:
7df8927691
Change-Id: I8ed21e40b96aa913b70fb24c649f3a310e99f2aa
Mark Lu [Fri, 23 Sep 2016 22:15:10 +0000 (22:15 +0000)]
docs: Add param info to TextView.setTextColor
am:
193879a8b6
Change-Id: I8c903627670c946bd421b3e77bbd2a372f21adf0
Mark Lu [Fri, 23 Sep 2016 22:10:36 +0000 (22:10 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:10:19 +0000 (22:10 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:09:31 +0000 (22:09 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 21:52:33 +0000 (21:52 +0000)]
Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
am:
c6a1076e40
Change-Id: I5ad3652863fef338ec6c704b9b030d9338256ac3
Mark Lu [Fri, 23 Sep 2016 21:52:30 +0000 (21:52 +0000)]
docs: Mention SwitchCompat in Switch and toggle documentation
am:
3404032dfc
Change-Id: Ia8aaadb4656a0fcb631ef9608f01afde4a00c4aa
Mark Lu [Fri, 23 Sep 2016 21:47:27 +0000 (21:47 +0000)]
Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
Andrew Solovay [Fri, 23 Sep 2016 21:23:27 +0000 (21:23 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev
am:
ddcf2deb14
Change-Id: Id81d393e2a8f1f40b9a50e6b266d9ce6e1fe6d4e
Andrew Solovay [Fri, 23 Sep 2016 21:23:23 +0000 (21:23 +0000)]
docs: Removed two images that were moved to Piper in April
am:
f955d4cd9f
Change-Id: I5bee69d05597c00ac04ebf0b5e281e1a468be1d5
Andrew Solovay [Fri, 23 Sep 2016 21:15:28 +0000 (21:15 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev
Etan Cohen [Wed, 21 Sep 2016 18:18:35 +0000 (11:18 -0700)]
[NAN] Add Handler to publish/subscribe per API review
All callback registrations must have handlers.
(cherry-pick of commit
9b04fd2475f5ebecb81e75a8272cf410ba3f5854)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
Gopal Krishna Shukla [Fri, 23 Sep 2016 13:11:23 +0000 (13:11 +0000)]
Merge "Provide synchronization to setview to avoid NPE" am:
b05b93a674
am:
810c31fdca
Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a
Gopal Krishna Shukla [Fri, 23 Sep 2016 13:07:52 +0000 (13:07 +0000)]
Merge "Provide synchronization to setview to avoid NPE"
am:
b05b93a674
Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a
Treehugger Robot [Fri, 23 Sep 2016 12:57:57 +0000 (12:57 +0000)]
Merge "Provide synchronization to setview to avoid NPE"
Etan Cohen [Fri, 23 Sep 2016 04:16:50 +0000 (04:16 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am:
bc3d106b97
am:
a29bcecad9
Change-Id: I622b78805d08a4e9c59e207598ebc5f3cbf8d135
Etan Cohen [Fri, 23 Sep 2016 04:07:30 +0000 (04:07 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
am:
bc3d106b97
Change-Id: I1019b5c514424043144351aa893b4f5048e4207e
Etan Cohen [Fri, 23 Sep 2016 03:59:40 +0000 (03:59 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
Christopher Wiley [Thu, 22 Sep 2016 23:59:48 +0000 (23:59 +0000)]
Merge changes from topic 'remove-set-frequency-band' am:
430904a4ab
am:
5135fb8f04
Change-Id: I949e65bb49ab35d01f41f9ff8df74c2a735c8675
Christopher Wiley [Thu, 22 Sep 2016 23:58:52 +0000 (23:58 +0000)]
Remove ability to set frequency from WifiAssociationTest am:
93ce63760d
am:
4bec7b53b0
Change-Id: I53df1fdc9bd9fb748756a5b75d9cf0063d9e443c
Christopher Wiley [Thu, 22 Sep 2016 23:57:42 +0000 (23:57 +0000)]
Remove WifiManager#get/setFrequencyBand am:
79ec1736be
am:
a7394a4a70
Change-Id: Ia990b8c209bf7002830f5147d2435a5151ed85f7
Christopher Wiley [Thu, 22 Sep 2016 23:52:02 +0000 (23:52 +0000)]
Merge changes from topic 'remove-set-frequency-band'
am:
430904a4ab
Change-Id: Iadf94f5e95f9a53c03115a44594f32aba21ecb4f
Christopher Wiley [Thu, 22 Sep 2016 23:51:57 +0000 (23:51 +0000)]
Remove ability to set frequency from WifiAssociationTest
am:
93ce63760d
Change-Id: I334fde9e45a6ca6bba6e6a2ec5d9f68f52e31e03
Christopher Wiley [Thu, 22 Sep 2016 23:50:58 +0000 (23:50 +0000)]
Remove WifiManager#get/setFrequencyBand
am:
79ec1736be
Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8
Christopher Wiley [Thu, 22 Sep 2016 23:34:17 +0000 (23:34 +0000)]
Merge changes from topic 'remove-set-frequency-band'
* changes:
Remove ability to set frequency from WifiAssociationTest
Remove WifiManager#get/setFrequencyBand
Jaewan Kim [Thu, 22 Sep 2016 23:17:29 +0000 (23:17 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074 am:
1ab448b5d5 am:
5b649ddcc6 -s ours
am:
e36701214a
Change-Id: I45ecf1f660e94ef5487711b13d43f38931fb9447
Jaewan Kim [Thu, 22 Sep 2016 23:08:31 +0000 (23:08 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320 am:
03bad07418 am:
afab98a69e -s ours
am:
738c21253a
Change-Id: Ic596aa2c09ff2a3443020d24996bfd535413e4d8
Jaewan Kim [Thu, 22 Sep 2016 23:08:24 +0000 (23:08 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074 am:
1ab448b5d5
am:
5b649ddcc6 -s ours
Change-Id: I7de1101955e5152cd1fb5858ac93c9e94697b01b
Pavlin Radoslavov [Thu, 22 Sep 2016 22:57:06 +0000 (22:57 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" am:
3b0256fc73
am:
829285c38e
Change-Id: I488915e4f0f8bcc9b90f61699f000831f2d393fe
Jaewan Kim [Thu, 22 Sep 2016 22:51:23 +0000 (22:51 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320 am:
03bad07418
am:
afab98a69e -s ours
Change-Id: I8ddca6c69539eb9cc568e5fcec011a3c58450fcc
Colin Cross [Thu, 22 Sep 2016 22:51:08 +0000 (22:51 +0000)]
Merge "aapt: remove duplicate definition of ZD" am:
ac2d839d7c
am:
3efa1e7c17
Change-Id: Ie3109031c4a5499c6d5ff5e6ec097ab64c86d0b2
Jaewan Kim [Thu, 22 Sep 2016 22:40:32 +0000 (22:40 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074
am:
1ab448b5d5
Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807
Pavlin Radoslavov [Thu, 22 Sep 2016 22:39:31 +0000 (22:39 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
am:
3b0256fc73
Change-Id: If33f7f2787ee94609e9fbb0ea52f66bdbdf57614
Jaewan Kim [Thu, 22 Sep 2016 22:39:30 +0000 (22:39 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320
am:
03bad07418
Change-Id: Ia687cf7aa14eb11452d390d47bc13ba4dfba0cda
Jaewan Kim [Thu, 22 Sep 2016 22:27:37 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31
am:
09edfde074
Change-Id: I8365e943aab82305fbc5775e8044dc7f014c0cdc
Jaewan Kim [Thu, 22 Sep 2016 22:26:12 +0000 (22:26 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055
am:
351aa0b320
Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc
Jaewan Kim [Thu, 22 Sep 2016 22:21:52 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours
am:
2cd4383c31
Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0
Jaewan Kim [Thu, 22 Sep 2016 22:20:54 +0000 (22:20 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours
am:
e9a9e2f055
Change-Id: Iaa0f0e473c9e2389c75c5d4dd9b4ff5e244ba442
Android Build Merger (Role) [Thu, 22 Sep 2016 21:57:54 +0000 (21:57 +0000)]
Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87 am:
832179120f -s ours am:
c547eeda12" into nyc-dev-plus-aosp
Jaewan Kim [Thu, 22 Sep 2016 21:57:09 +0000 (21:57 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87 am:
832179120f -s ours
am:
c547eeda12
Change-Id: I0163065681c16466114ee3329862bceb08c5ec4e
Jaewan Kim [Thu, 22 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81
am:
585f642d65 -s ours
Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14
Android Build Merger (Role) [Thu, 22 Sep 2016 21:56:34 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890 am:
4da22f27f6 -s ours am:
36068a2f00" into nyc-dev-plus-aosp
Treehugger Robot [Thu, 22 Sep 2016 21:56:09 +0000 (21:56 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
Jaewan Kim [Thu, 22 Sep 2016 21:55:59 +0000 (21:55 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890 am:
4da22f27f6 -s ours
am:
36068a2f00
Change-Id: I2e7639c73505ad3016bef974fad7724c05e7e6b3
Jaewan Kim [Thu, 22 Sep 2016 21:55:51 +0000 (21:55 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9
am:
ed3e26e2be -s ours
Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e
liulvping [Thu, 22 Sep 2016 21:55:31 +0000 (21:55 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()" am:
f4c8c3590a
am:
659cdfef75
Change-Id: I253117165d33dccc8544587968503f2ef61484c3
Colin Cross [Thu, 22 Sep 2016 21:55:27 +0000 (21:55 +0000)]
Merge "aapt: remove duplicate definition of ZD"
am:
ac2d839d7c
Change-Id: I7f2388c9f0cd649ef79db41c67a4f07cbb18a3c9
Andrew Solovay [Thu, 22 Sep 2016 21:24:57 +0000 (14:24 -0700)]
docs: Removed two images that were moved to Piper in April
Scott had migrated these graphics to Piper in April, but they've
stayed in Gerrit. These graphics had been updated in Gerrit since
then, so they got out of sync with Piper.
Set up Critique CL cr/
133998971 to migrate the latest versions
to Piper (and sent to Scott for review); setting up a separate
CL here to remove the files, so they won't accidentally get
edited in the wrong place again.
Change-Id: Ice9dda71ae3604b1fc3aab15746dc41e759b80a6
Treehugger Robot [Thu, 22 Sep 2016 21:24:46 +0000 (21:24 +0000)]
Merge "aapt: remove duplicate definition of ZD"
Android Build Merger (Role) [Thu, 22 Sep 2016 20:35:08 +0000 (20:35 +0000)]
Merge "Merge "Remove has_trivial_move trait from StringPool types" am:
d333f28397 am:
6f02f57f12" into nyc-dev-plus-aosp
Jaewan Kim [Thu, 22 Sep 2016 20:35:00 +0000 (20:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87
am:
832179120f -s ours
Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53
Jaewan Kim [Thu, 22 Sep 2016 20:34:22 +0000 (20:34 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79
am:
462493ee81
Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a
Jaewan Kim [Thu, 22 Sep 2016 20:33:44 +0000 (20:33 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890
am:
4da22f27f6 -s ours
Change-Id: Ie18197c55022197b4dcc9f8e2d45cb5cc78dcdd0
Colin Cross [Thu, 22 Sep 2016 20:33:25 +0000 (20:33 +0000)]
Merge "Remove has_trivial_move trait from StringPool types" am:
d333f28397
am:
6f02f57f12
Change-Id: Iba0bb317fb0df1e2c5189dde3743f21bdd00ec38
Jaewan Kim [Thu, 22 Sep 2016 20:33:24 +0000 (20:33 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9
am:
3ea1f124f9
Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1
Ajay Panicker [Thu, 22 Sep 2016 20:33:21 +0000 (20:33 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f am:
2a214fc5f2 am:
0ec10c8fdc -s ours
am:
916552b0c9
Change-Id: Iacc0a20de196e47f351cc6010712b5ed4053ab77
liulvping [Thu, 22 Sep 2016 20:30:51 +0000 (20:30 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"
am:
f4c8c3590a
Change-Id: I1e4f7913cc00635611440faabcab4faff7f35dc5
Jaewan Kim [Thu, 22 Sep 2016 20:05:57 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243
am:
dd883c7e87
Change-Id: Id9a90d8d49724435fced962b42a89edbb90846c3
Jaewan Kim [Thu, 22 Sep 2016 20:05:49 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours
am:
ded4df2e79
Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61
Pavlin Radoslavov [Thu, 22 Sep 2016 00:28:11 +0000 (17:28 -0700)]
Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind
Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.
Bug:
31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e