OSDN Git Service
Jon Dormody [Mon, 29 Jan 2018 19:40:10 +0000 (19:40 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
am:
7b3c924114
Change-Id: I8a010a0b326f58a5c3e1d0b86f4990123cd67307
Jon Dormody [Mon, 29 Jan 2018 19:34:59 +0000 (19:34 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug:
6442659" into oc-mr1-dev
am:
04d261f309
Change-Id: I15d0773c820591f153c67382b8826131eb88f98a
Jon Dormody [Mon, 29 Jan 2018 19:23:32 +0000 (19:23 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:23:15 +0000 (19:23 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug:
6442659" into oc-mr1-dev
Ruchi Kandoi [Mon, 29 Jan 2018 18:25:10 +0000 (18:25 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am:
ac2247c406
am:
626f665a65
Change-Id: I562b46b71416406e2640fc84f7b6a064327a7ca8
Ruchi Kandoi [Mon, 29 Jan 2018 18:18:11 +0000 (18:18 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
am:
ac2247c406
Change-Id: I6592686f765e3474d1c02bf9b3bc243ab152b641
Treehugger Robot [Mon, 29 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Ricardo Loo Foronda [Mon, 29 Jan 2018 17:12:00 +0000 (17:12 +0000)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
am:
f8f6d0a8ec
Change-Id: I8aabec3ac04c0a732efe705919f53a3cadd8c63a
Jason Monk [Mon, 29 Jan 2018 16:06:51 +0000 (16:06 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices" am:
a20239bf71
am:
38cbc885d1
Change-Id: I3ebdf0ad481dcf9e6ec2d12151d591a24c40458a
David Brazdil [Mon, 29 Jan 2018 15:59:49 +0000 (15:59 +0000)]
Merge "Control hidden API toast with a system property" am:
13020490be
am:
a9b3f91828
Change-Id: Iac1fdeff968b131e8f3486060dfb7cdeed446157
Jason Monk [Mon, 29 Jan 2018 15:56:06 +0000 (15:56 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
am:
a20239bf71
Change-Id: I30fbb071d290ff8477560f25216dd1ea04c789a6
David Brazdil [Mon, 29 Jan 2018 15:52:46 +0000 (15:52 +0000)]
Merge "Control hidden API toast with a system property"
am:
13020490be
Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d
Treehugger Robot [Mon, 29 Jan 2018 14:55:21 +0000 (14:55 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
David Brazdil [Mon, 29 Jan 2018 14:46:06 +0000 (14:46 +0000)]
Merge "Control hidden API toast with a system property"
David Brazdil [Fri, 26 Jan 2018 12:23:15 +0000 (12:23 +0000)]
Control hidden API toast with a system property
CL Id0a4200f912ac3303026cb26b6d8974c47332828 sets a system property
"ro.art.hiddenapi.warning" for non-release, non-user builds. This
patch reads that flag and unless the flag is set, will only ever show
the warning message if the app is debuggable.
Test: manual
Bug:
64382372
Change-Id: I9b552792779589a7a91818a82d5c86141fc0a30b
Ricardo Loo Foronda [Thu, 25 Jan 2018 16:42:43 +0000 (08:42 -0800)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
Status: Ready for review
Note: This is a Javadoc only change.
Changes: Removed unnecessary "(TODO)" note.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/app/Notification.html#FLAG_SHOW_LIGHTS
Bug:
20150478
Change-Id: I3a7fc0414ccb6f52e9b4919031a93ca1a7a29336
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:11:43 +0000 (04:11 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
am:
16a77c54ef
Change-Id: Ifb88d7364a377092509bb9a93def65ccca7dcf41
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:04:09 +0000 (04:04 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:39:30 +0000 (02:39 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
am:
1299d4b0a9
Change-Id: Ib2911651950048305b00df5f26ca5656e205bcee
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:27:48 +0000 (02:27 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
Bill Yi [Sun, 28 Jan 2018 06:56:41 +0000 (06:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
a1b9eecab0 -s ours
Change-Id: Ibf30adce3835b1023b40b814fe5dfb46dfd04d06
TreeHugger Robot [Sun, 28 Jan 2018 06:49:19 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 27 Jan 2018 17:39:47 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
ac3264742d -s ours
Change-Id: I7c30321b70de8f0f35057356b17673a15f6b2b09
TreeHugger Robot [Sat, 27 Jan 2018 17:32:17 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Erik Kline [Sat, 27 Jan 2018 07:43:33 +0000 (07:43 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities" am:
2aed62d664
am:
d98c6b91a5
Change-Id: I653951f1aac8113ecfe373b0e69a455ccd46796c
Erik Kline [Sat, 27 Jan 2018 07:35:21 +0000 (07:35 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"
am:
2aed62d664
Change-Id: I3d93baafab1bc9be4bee6246cc3e04682363a690
Treehugger Robot [Sat, 27 Jan 2018 07:20:10 +0000 (07:20 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"
Jack Yu [Sat, 27 Jan 2018 03:42:06 +0000 (03:42 +0000)]
Merge "Added nullable callback support" am:
35520445be
am:
19f9299af6
Change-Id: I1701893d61b9e459b0f22e0165d03f5efadfd56e
Jack Yu [Sat, 27 Jan 2018 03:35:50 +0000 (03:35 +0000)]
Merge "Added nullable callback support"
am:
35520445be
Change-Id: Ic34fd279a8a125e4ab7fe634dbb38479860932c2
Treehugger Robot [Sat, 27 Jan 2018 03:24:52 +0000 (03:24 +0000)]
Merge "Added nullable callback support"
Ruchi Kandoi [Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)]
Merge "Add UID and Service for Secure Element Application" am:
b8b7589531
am:
8ee3204c58
Change-Id: I7c74f21e014fb7eb772e2d86cc278fd774ffb8c9
Ruchi Kandoi [Sat, 27 Jan 2018 01:52:33 +0000 (01:52 +0000)]
Merge "Add UID and Service for Secure Element Application"
am:
b8b7589531
Change-Id: Ib66be1532dd440b1161e6d2d727243fc6b9e614f
Bill Yi [Sat, 27 Jan 2018 01:50:20 +0000 (17:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7539ffdd87c19fc7dfd694dacd78f62fbec10397
Ruchi Kandoi [Wed, 3 Jan 2018 20:20:46 +0000 (12:20 -0800)]
Add android.Manifest.permission.NFC_TRANSACTION_EVENT
This permission would gate if an application is eligible to receive
notifications about nfc transactions taking place on the Secure
Elements.
Bug:
72556384
Test: Test dummy notifications on sample app.
Change-Id: I233f7185bbc3a5511f79ae012cc60a081968eb99
Jack Yu [Sat, 27 Jan 2018 00:03:17 +0000 (16:03 -0800)]
Added nullable callback support
Sometimes data service clients do not care the result of the
requests so they pass null callback. In this case the data service
should handle it.
Test: Manual
Bug:
64132030
Change-Id: Ib188994fed4e708de875a24d5386a74a8f6db4dd
Jack Yu [Sat, 27 Jan 2018 00:59:45 +0000 (00:59 +0000)]
Merge "Renamed Result to ResultCode" am:
093ab1dc61
am:
ce29c3ecbd
Change-Id: I7c3b24d7ced5b2b7f468a03c2caf85f66e881301
Treehugger Robot [Sat, 27 Jan 2018 00:53:00 +0000 (00:53 +0000)]
Merge "Add UID and Service for Secure Element Application"
Jack Yu [Sat, 27 Jan 2018 00:52:06 +0000 (00:52 +0000)]
Merge "Renamed Result to ResultCode"
am:
093ab1dc61
Change-Id: I1dda97b48a3f5068fc001478b88190406f03d109
Treehugger Robot [Sat, 27 Jan 2018 00:39:37 +0000 (00:39 +0000)]
Merge "Renamed Result to ResultCode"
hirotaka motegi [Sat, 27 Jan 2018 00:13:47 +0000 (00:13 +0000)]
Merge "Support Background Service Limitations." am:
a0f863d4fb
am:
b747134254
Change-Id: I14259c8d36028440323f940e212c9099a62a6c87
Pavlin Radoslavov [Sat, 27 Jan 2018 00:01:20 +0000 (00:01 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am:
bb5318df8a
am:
adf2239562
Change-Id: Ibe372b2ecda317e7970d6e681a4e2330e69782c1
hirotaka motegi [Fri, 26 Jan 2018 23:57:58 +0000 (23:57 +0000)]
Merge "Support Background Service Limitations."
am:
a0f863d4fb
Change-Id: I9adaa11f83492d5e09d19ded088deb7119bcdade
Pavlin Radoslavov [Fri, 26 Jan 2018 23:53:17 +0000 (23:53 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
am:
bb5318df8a
Change-Id: I9fabffc6d7fdb3cb001b685618532f10000dd4ac
Treehugger Robot [Fri, 26 Jan 2018 23:36:21 +0000 (23:36 +0000)]
Merge "Support Background Service Limitations."
Pavlin Radoslavov [Fri, 26 Jan 2018 23:00:34 +0000 (23:00 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
3151e86aa8
am:
b51d583e32
Change-Id: I80fe36452b078b25f52eef6f22acdb20e06c10f5
Pavlin Radoslavov [Fri, 26 Jan 2018 22:53:02 +0000 (22:53 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am:
3151e86aa8
Change-Id: I1f1e62dde014fe4b0a2d3e93aeea0f305232bc01
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
Jonathan Dormody [Thu, 11 Jan 2018 20:18:59 +0000 (13:18 -0700)]
Docs: Added a link to the Motion Sensor docs for information on gravity
values and calculating alpha.
Test: make ds-docs
Bug:
6442659
Change-Id: Ifbb58526d01894c4c7570596348a8bd3e5c9eb4f
Jack Yu [Fri, 26 Jan 2018 22:06:17 +0000 (22:06 +0000)]
Merge "Added slot id in the internal API" am:
045ff781b9
am:
5674b8e119
Change-Id: I12f2a0e8d75e593ac046368ee94d1f8d183d6ded
Jack Yu [Fri, 26 Jan 2018 21:59:33 +0000 (21:59 +0000)]
Merge "Added slot id in the internal API"
am:
045ff781b9
Change-Id: I4222766dbd47c731b1612f9d4405375a7b4dd499
Bill Yi [Fri, 26 Jan 2018 21:18:18 +0000 (21:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c95d9b29e2 -s ours
Change-Id: Id188e8eb53b6b3e9d0c468b550fc5ae4ad602289
Bill Yi [Fri, 26 Jan 2018 21:15:34 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
4b7b89b9a1 -s ours
Change-Id: I57dae4e6dda7c007c9571d415b3e3e0aa332a753
Bill Yi [Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
a2c154e0cd -s ours
Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4
Bill Yi [Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
497bbfd9ac -s ours
Change-Id: I27a8de5dc0a587e0df6e6569f7703733c5d222fe
Pavlin Radoslavov [Thu, 4 Jan 2018 03:38:39 +0000 (19:38 -0800)]
Add support for Multi-A2DP state machines per device
* Update usage of A2dpService API calls that take BluetoothDevice
as an additional argument
* Update the description for BluetoothA2dp.connect()
Exempt-From-Owner-Approval: De-facto owner of the relevant changes is
the Bluetooth team.
Bug:
69269748
Test: Manual
Change-Id: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
Merged-In: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
(cherry picked from commit
502af2192c6d291174efa434a70101f302a5bd97)
Bill Yi [Fri, 26 Jan 2018 21:05:30 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
28abd94074 -s ours
Change-Id: I94d247f60e399547e4418859a014d2c48ac35674
Bill Yi [Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
178e861e6e -s ours
Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084
Bill Yi [Fri, 26 Jan 2018 20:59:57 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9531d0fd0b -s ours
Change-Id: I74d6220a3ec75c941b31cb4bef960dc21aa4bade
TreeHugger Robot [Fri, 26 Jan 2018 20:54:50 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:46 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:41 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:03 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
David Brazdil [Fri, 26 Jan 2018 19:39:20 +0000 (19:39 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder" am:
656096516c
am:
47f632d48f
Change-Id: I99148ade6a6fafe63618312c228fbe6372e3b401
Primiano Tucci [Fri, 26 Jan 2018 19:29:31 +0000 (19:29 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd" am:
a946cc9f53
am:
71411b877a
Change-Id: I8c07b8650a508f03352075ac7bd6e7943f6cacb4
Jack Yu [Fri, 26 Jan 2018 19:25:13 +0000 (19:25 +0000)]
Merge "Added slot id in the internal API"
David Brazdil [Fri, 26 Jan 2018 19:24:35 +0000 (19:24 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
am:
656096516c
Change-Id: Icfda85f4f80516d6f4141be7ede7d047df6aeecf
Primiano Tucci [Fri, 26 Jan 2018 19:18:24 +0000 (19:18 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
am:
a946cc9f53
Change-Id: Ie7a7071264cb91d26eb380b3155a5ed71667fb46
Pavlin Radoslavov [Sun, 21 Jan 2018 10:59:15 +0000 (02:59 -0800)]
Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
When there are multiple connected A2DP/HFP devices, if a connected
device's name is clicked on, that device will be chosen as
Active - i.e., it will be the device chosen for audio out / phone call.
Also:
* Listen to the BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED
and BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents
and update the the status of the current active device.
* When connecting a new device, and Multi-A2DP is enabled, don't
disconnect the currently connected device.
* Update the implementation of isA2dpPlaying() so it correctly checks
all connected devices, not only the first one.
Test: Manual: multiple connected A2DP devices, and selecting each as
the Active Device.
Bug:
64767509
Change-Id: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
Merged-In: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
(cherry picked from commit
1af33a192614bb490701ab2e8e21866690b3b4fa)
Ruchi Kandoi [Thu, 4 Jan 2018 00:14:57 +0000 (16:14 -0800)]
Add UID and Service for Secure Element Application
Bug:
64994044
Test: Boot; Check Service loaded.
Merged-In: I2f48ff204acd29b1a9f6819910aba5f8f3762977
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
(cherry picked from commit
dfaf4bdd1e7e12caf9bb69c8facc38e879861baf)
Chad Brubaker [Fri, 26 Jan 2018 18:52:47 +0000 (18:52 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
am:
7ebe5f0ba1
Change-Id: I39d11196229806e4f1fdb171623d8cd94b1d3fbf
TreeHugger Robot [Fri, 26 Jan 2018 18:40:16 +0000 (18:40 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c358d2b6dc -s ours
Change-Id: I99e0718b5e031415d04140d76176f569b9576e04
TreeHugger Robot [Fri, 26 Jan 2018 18:28:20 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Ricardo Loo Foronda [Thu, 25 Jan 2018 17:10:47 +0000 (09:10 -0800)]
Docs: Fixed broken link to Traceview docs
Status: Ready for review.
Note: This is a Javadoc only change.
Changes:
* Replaced "guide/developing/tools/traceview.html/ with
"studio/profile/traceview.html"
Test: * Build with "make ds-docs -j16"
* Staged content at go/dac-stage/reference/android/os/Debug.html
* Ran linkchecker against staged content
Bug:
37640935
Change-Id: I0446c44a78ae7d1d9193e2fe08e059cdc90cac7a
Ricardo Loo Foronda [Thu, 25 Jan 2018 01:49:18 +0000 (17:49 -0800)]
docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED
Status: Ready for writer review.
Note: This is a javadoc only change.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html#ACTION_CONNECTION_STATE_CHANGED
Bug:
69097875
Change-Id: Ibffea2373ded825558beaa669ae4daf3c0ff3d2f
Jack Yu [Fri, 26 Jan 2018 17:21:16 +0000 (09:21 -0800)]
Renamed Result to ResultCode
Test: Manual
Bug:
64132030
Change-Id: Idd49322186d1a60c9846cc205964f3b2e318c31a
Bill Yi [Fri, 26 Jan 2018 17:04:23 +0000 (09:04 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3b82c404d34ad6d9560e1c8b0e31ff9223394022
David Brazdil [Fri, 26 Jan 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
Treehugger Robot [Fri, 26 Jan 2018 15:51:57 +0000 (15:51 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
Bill Yi [Fri, 26 Jan 2018 15:25:46 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2c25ff050a1cee7b26d5939f98fdb9bc4809141c
Tobias Thierer [Fri, 26 Jan 2018 14:25:41 +0000 (14:25 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." am:
9f82b6bab5
am:
c4905215cb
Change-Id: I064799b5db75c15bff441e9e35a32f5e89f56c35
Primiano Tucci [Fri, 26 Jan 2018 14:25:18 +0000 (14:25 +0000)]
DropBoxManager: Allow adding a file using an fd
This patch adds an overload to DropBoxManager::addFile() which accepts
an already-opened file as a file descriptor. This avoids the need for
clients to create a filesystem-visible file when uploading data to
DropBox.
Test: Tested with perfetto using https://android-review.googlesource.com/c/platform/external/perfetto/+/587674
Change-Id: I076bfd3180fb9b4baff7e1bae2e611419061b2a7
Merged-In: I076bfd3180fb9b4baff7e1bae2e611419061b2a7
Tobias Thierer [Fri, 26 Jan 2018 14:18:44 +0000 (14:18 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
am:
9f82b6bab5
Change-Id: I8cc8b609a02e5059bcda111a416d47d7272c4e3b
David Srbecky [Fri, 26 Jan 2018 14:05:12 +0000 (14:05 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART" am:
418a96457c
am:
637814eebf
Change-Id: I0ecf4d2d1922cfe9948936ef3e494f0a71e6c2f5
David Srbecky [Fri, 26 Jan 2018 13:59:35 +0000 (13:59 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
am:
418a96457c
Change-Id: Ife46a3f6e1c5ad33e7830df0c74a6cbd674f8032
Tobias Thierer [Fri, 26 Jan 2018 13:05:06 +0000 (13:05 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
David Srbecky [Fri, 26 Jan 2018 12:37:48 +0000 (12:37 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
Bill Yi [Fri, 26 Jan 2018 12:15:30 +0000 (04:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61de32231eba5d425f9bd9e7f752173a32855659
Bill Yi [Fri, 26 Jan 2018 12:00:28 +0000 (04:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7ed6ce9696bdff74bd8b341d6ff7800ed7d97603
David Brazdil [Fri, 26 Jan 2018 11:13:35 +0000 (11:13 +0000)]
Copy hidden API blacklist/dark greylist into build folder
This change is meant for ART buildbots which build against a pinned
commit of the framework and thus do not have the commit which
introduced hidden API lists. Normal builds will now copy the blacklist
and dark greylist into the build folder first, and then generate the
light greylist as usual. If a buildbot does not have the framework
changes, it can create dummy API lists in the build folder before
starting the build and avoid the issue.
Test: make
Bug:
64382372
Change-Id: Ib6e53a45bcc917abb4ba67fdcbf01d4a19c2d56f
Bill Yi [Fri, 26 Jan 2018 11:46:02 +0000 (03:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic6daaa066fffa3012ec457d32827114ffdcdbf34
Bill Yi [Fri, 26 Jan 2018 11:31:30 +0000 (03:31 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2e6b950b2d9e70b93bf01c09cc3d1a7b325ce562
Erik Kline [Fri, 26 Jan 2018 10:23:14 +0000 (19:23 +0900)]
Add Tethering's UID to the legacy type NetworkCapabilities
This is needed because satisfiedByNC() compares UIDs by default now, and
the NCs we receive in callbacks have Tethering's UID patched in.
Bug:
72498421
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes, module library loading failures:
Caused by: java.lang.UnsatisfiedLinkError: dlopen failed: library "libdexfile.so" not found
- manually starting tethering works fine
Change-Id: I31f6516e2c1539809f8d052333fd2a616158cb92
Bill Yi [Fri, 26 Jan 2018 10:35:09 +0000 (02:35 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic8b87dc116e142b61b415bd41682cc3a0d1535b6
Bill Yi [Fri, 26 Jan 2018 10:04:47 +0000 (02:04 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I909efee7ae06d35c4947257213e045a97cf69e2e
Andreas Gampe [Fri, 26 Jan 2018 06:05:51 +0000 (06:05 +0000)]
Merge "Watchdog: Add statsd to interesting processes" am:
8e8c9664ae
am:
6b0c805328
Change-Id: I7efcb364d6678ac80ef3e5e32794fbc5ffbe2a73
OSDN Git Service
