OSDN Git Service
Neil Fuller [Fri, 15 Sep 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd am:
1157a7196b
am:
9c60a8d3f1
Change-Id: I39ad444c735b5c11954700d5ae2ceaf74f747c4a
Adam Lesinski [Fri, 15 Sep 2017 16:57:21 +0000 (16:57 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
am:
e02983681a
Change-Id: I42369e6fb7bd121e45b5a002cd5f00e05221ead3
Neil Fuller [Fri, 15 Sep 2017 16:53:24 +0000 (16:53 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd
am:
1157a7196b
Change-Id: I9f8a65fcb375678dc1290c155ec2c755fb5bfd62
Adam Lesinski [Fri, 15 Sep 2017 16:49:34 +0000 (16:49 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
* changes:
AAPT2: Bump to version 2.19
AAPT2: Fix issue with resource deduping
AAPT: Dump badging should pickup strings from the right package
AAPT2: Change the daemon mode to be line based
AAPT2: better error handling for daemon mode
AAPT2: Fix regression in Manifest.java permissions
AAPT2: Define intermediate compiled XML proto
AAPT2: Add a daemon mode
AAPT2: Fix mkdirs implementation
AAPT2: Change XmlDom to exclude Namespace as a node
AAPT2: Fix windows unicode path issues
AAPT2: Fix typo in Config parsing
AAPT2: Change proto format to reduce usage of StringPool
AAPT2: Add navigation type
AAPT2: Document Format.proto
Neil Fuller [Fri, 15 Sep 2017 16:47:07 +0000 (16:47 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
am:
fab8162abd
Change-Id: I6478c02a4f37f7346a58cd980c21980234c50fec
Treehugger Robot [Fri, 15 Sep 2017 16:38:38 +0000 (16:38 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
Fix a no-op uninstall being treated as a failure
Treat a stageUninstall() doing nothing as a success, not a
failure. This prevents the system retrying the uninstall
later.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual testing, adb dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657176
Merged-in: Ifd205da90e848552711ac3f4207cd22ad2c2747b
Change-Id: Ifd205da90e848552711ac3f4207cd22ad2c2747b
(cherry picked from commit
8e27c9226b82f41279ee6c108d2b06bb6f1cef5e)
Neil Fuller [Fri, 15 Sep 2017 09:51:42 +0000 (09:51 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
am:
293e2f9955 -s ours
Change-Id: Ib284f6bd5932b602de55bf154b644dc43a2774ec
Neil Fuller [Fri, 15 Sep 2017 09:40:05 +0000 (09:40 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
Adam Lesinski [Wed, 13 Sep 2017 21:46:00 +0000 (14:46 -0700)]
AAPT2: Bump to version 2.19
Test: manual
Bug:
65645766
Change-Id: Id8bdb14e498bd79ff642f9ad56ef05ec7a5825af
Merged-In: Id8bdb14e498bd79ff642f9ad56ef05ec7a5825af
Yohei Yukawa [Fri, 15 Sep 2017 03:51:23 +0000 (03:51 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
am:
7bbe06231f
Change-Id: Ica5ba4969d1961acd7c037cae285d29c69da1407
TreeHugger Robot [Fri, 15 Sep 2017 03:39:41 +0000 (03:39 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 03:26:50 +0000 (03:26 +0000)]
Merge "API council suggested edits, part 3" am:
7a4cc05d45 am:
4c4fb3bdfb
am:
7fd9aa2654
Change-Id: I6764968b4b3f71be799b0a5e835fdc3624849364
Hall Liu [Fri, 15 Sep 2017 03:22:23 +0000 (03:22 +0000)]
Merge "Apply suggested edits to the file-download API" am:
f6c9baa0cd am:
3934c475ce
am:
febecb8218
Change-Id: Ibf5acac5b44c772b629472591124151c479c8f6c
Android Build Merger (Role) [Fri, 15 Sep 2017 02:49:26 +0000 (02:49 +0000)]
Merge "Merge "Fix missing null checking" into oc-mr1-dev am:
93d436f4bc" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 15 Sep 2017 02:48:47 +0000 (02:48 +0000)]
Merge changes from topic "am-
37ab0897d803452791072eae772298af" into oc-mr1-dev-plus-aosp
* changes:
Merge changes Id931d441,I83faf974 am:
89c94f67b4 am:
66d7275d39 am:
dd3f6046b3 -s ours
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours am:
f0a3c209ea -s ours am:
add03c6742 -s ours
Jiyong Park [Fri, 15 Sep 2017 02:47:46 +0000 (02:47 +0000)]
Merge "Fix missing null checking" into oc-mr1-dev
am:
93d436f4bc
Change-Id: Ib0a68cdf2d45141895191b7e2250ab0505c5a7ea
Narayan Kamath [Fri, 15 Sep 2017 02:46:33 +0000 (02:46 +0000)]
Merge changes Id931d441,I83faf974 am:
89c94f67b4 am:
66d7275d39
am:
dd3f6046b3 -s ours
Change-Id: I28b811c6ef8739f20d88f28023b6f3bafb977a28
Narayan Kamath [Fri, 15 Sep 2017 02:45:30 +0000 (02:45 +0000)]
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours am:
f0a3c209ea -s ours
am:
add03c6742 -s ours
Change-Id: If2a66d01b274ab82b0c8d2b37fc0030a67ad7b6f
Android Build Merger (Role) [Fri, 15 Sep 2017 02:43:45 +0000 (02:43 +0000)]
Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16 am:
531a955dba" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 15 Sep 2017 02:43:03 +0000 (02:43 +0000)]
Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am:
cebe432650" into oc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 15 Sep 2017 02:42:06 +0000 (02:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16
am:
531a955dba
Change-Id: Iacfb1e2fc9b06ba9f559e44633a19ad6ab4f9038
sergeyv [Fri, 15 Sep 2017 02:40:32 +0000 (02:40 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
am:
cebe432650
Change-Id: Id5d81c128f6e96bef732508b8a50bad35f3cb298
Jakub Pawlowski [Fri, 15 Sep 2017 02:38:09 +0000 (02:38 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6 am:
3aa179fabd
am:
e22de0f23f
Change-Id: I30dc6840311d338976240cc86b9da9b116b175ad
Andreas Gampe [Fri, 15 Sep 2017 02:34:44 +0000 (02:34 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
am:
2437f9f10c
Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec
Jean-Michel Trivi [Fri, 15 Sep 2017 02:28:28 +0000 (02:28 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
am:
982ee8e6c3
Change-Id: Ifa18821b2ae5b3103f5025df88c0e545bdca56af
Kevin Hufnagle [Fri, 15 Sep 2017 02:24:50 +0000 (02:24 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16
am:
677b6f5a7b
Change-Id: Ib225f08dd4d53479adab6df0f3559d09fe09ab21
Lucas Dupin [Fri, 15 Sep 2017 02:20:58 +0000 (02:20 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
am:
06dc14cabc
Change-Id: I838cbedf1388e8fcab56ecf824730b9ac871a738
Jiyong Park [Fri, 15 Sep 2017 02:19:19 +0000 (02:19 +0000)]
Merge "Fix missing null checking" into oc-mr1-dev
Matthew Ng [Fri, 15 Sep 2017 02:17:32 +0000 (02:17 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
am:
33b1e1fe4d
Change-Id: Ic7c0ffeb7f295c4161d01d7ad1d0ae2eae6d9f85
TreeHugger Robot [Fri, 15 Sep 2017 02:15:23 +0000 (02:15 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
Matthew Ng [Fri, 15 Sep 2017 02:14:26 +0000 (02:14 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
am:
03f8b068a9
Change-Id: I83d71c531785410cf7aaaf18d921b0a3bcfa77eb
TreeHugger Robot [Fri, 15 Sep 2017 02:11:12 +0000 (02:11 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
Beverly [Fri, 15 Sep 2017 02:10:50 +0000 (02:10 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
am:
8bba760b4f
Change-Id: Ib0982cf352af1e107f182251a1d01382865228d8
Hall Liu [Fri, 15 Sep 2017 01:54:30 +0000 (01:54 +0000)]
Merge "API council suggested edits, part 3" am:
7a4cc05d45
am:
4c4fb3bdfb
Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f
Jean-Michel Trivi [Fri, 15 Sep 2017 01:37:55 +0000 (01:37 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 01:35:37 +0000 (01:35 +0000)]
Merge "Apply suggested edits to the file-download API" am:
f6c9baa0cd
am:
3934c475ce
Change-Id: Id1a1e80269263ecf10d80795cea64f16aa1f6058
Narayan Kamath [Fri, 15 Sep 2017 01:09:04 +0000 (01:09 +0000)]
Merge changes Id931d441,I83faf974 am:
89c94f67b4
am:
66d7275d39
Change-Id: Ic0d6dba2b5560b335b3be8e27a88c01c960ec0aa
Narayan Kamath [Fri, 15 Sep 2017 01:08:10 +0000 (01:08 +0000)]
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours
am:
f0a3c209ea -s ours
Change-Id: Ia7d6e42a813e2277a60eb4def84c106e744aea11
Kevin Hufnagle [Fri, 15 Sep 2017 01:01:15 +0000 (01:01 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
TreeHugger Robot [Fri, 15 Sep 2017 00:56:22 +0000 (00:56 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 00:55:42 +0000 (00:55 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ic808c82a82028169ed7aebd8c6d1b25f9e2b84cf
Hall Liu [Fri, 15 Sep 2017 00:45:05 +0000 (00:45 +0000)]
Merge "API council suggested edits, part 3"
am:
7a4cc05d45
Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
Kevin Hufnagle [Fri, 15 Sep 2017 00:42:20 +0000 (00:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
am:
6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
Hall Liu [Fri, 15 Sep 2017 00:40:49 +0000 (00:40 +0000)]
Merge "Apply suggested edits to the file-download API"
am:
f6c9baa0cd
Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
Hall Liu [Fri, 15 Sep 2017 00:21:58 +0000 (00:21 +0000)]
Merge "API council suggested edits, part 3"
Hall Liu [Fri, 15 Sep 2017 00:21:13 +0000 (00:21 +0000)]
Merge "Apply suggested edits to the file-download API"
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
Jakub Pawlowski [Fri, 15 Sep 2017 00:01:54 +0000 (00:01 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6
am:
3aa179fabd
Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88
Yohei Yukawa [Thu, 14 Sep 2017 23:35:06 +0000 (16:35 -0700)]
Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS
TYPE_TEXT_FLAG_NO_SUGGESTIONS is just a hint and does not mean
IME should never show a UI to display suggestions.
This CL makes that point clear in JavaDoc.
Test: checkbuild
Bug:
35875399
Bug:
38139781
Bug:
38184682
Fixes:
65693181
Change-Id: Id0c3b6bc05689a5f1c8b52637664f59d45850a60
Narayan Kamath [Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)]
Merge changes Id931d441,I83faf974
am:
89c94f67b4
Change-Id: Ifc090e141092bcee11704e45d6f97f642040d002
Narayan Kamath [Thu, 14 Sep 2017 23:55:49 +0000 (23:55 +0000)]
Zygote: Fix race condition on package preloads.
am:
a3d4230b92 -s ours
Change-Id: I6fc6b967f04a6f3cc87908b7fdba72e26a9fb025
Treehugger Robot [Thu, 14 Sep 2017 23:41:34 +0000 (23:41 +0000)]
Merge changes Id931d441,I83faf974
* changes:
Zygote: Improve logging and error handling during connections.
Zygote: Fix race condition on package preloads.
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:00 +0000 (23:36 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
am:
fee4546fd6
Change-Id: If7ee44287dbec54e49df9fc350b2ebdfcdaeb431
TreeHugger Robot [Thu, 14 Sep 2017 23:28:24 +0000 (23:28 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 23:27:04 +0000 (23:27 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
Jiyong Park [Thu, 14 Sep 2017 22:48:06 +0000 (07:48 +0900)]
Fix missing null checking
Bug:
65666724
Test: build
Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
Treehugger Robot [Thu, 14 Sep 2017 22:59:37 +0000 (22:59 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
* changes:
Fix included service parsing (3/3)
Bluetooth: fix typo in comment
Lucas Dupin [Thu, 14 Sep 2017 22:32:57 +0000 (22:32 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev
am:
a4996f241f
Change-Id: Iad619b9585fd3e0859e3588cc5d6dbb604f763e7
TreeHugger Robot [Thu, 14 Sep 2017 22:26:55 +0000 (22:26 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev
Alan Viverette [Thu, 14 Sep 2017 21:59:37 +0000 (21:59 +0000)]
Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev
am:
c668bc0d92
Change-Id: Id1884d29e0d43808024947de6c366312d2e3e7d0
Hall Liu [Sat, 9 Sep 2017 01:02:38 +0000 (18:02 -0700)]
API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.
Bug:
30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
TreeHugger Robot [Thu, 14 Sep 2017 21:49:43 +0000 (21:49 +0000)]
Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:41:39 +0000 (21:41 +0000)]
Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
am:
a57aea0d61
Change-Id: I1aa4703f4d5fb110c0b4261cc091ba8dbfc5e5f1
Hall Liu [Sat, 2 Sep 2017 00:59:15 +0000 (17:59 -0700)]
Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale
Bug:
30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
Lei Yu [Thu, 14 Sep 2017 21:31:11 +0000 (21:31 +0000)]
Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
Andreas Gampe [Thu, 14 Sep 2017 21:02:09 +0000 (14:02 -0700)]
Frameworks: Fix NPE for agent attach
Fix missing null check.
Bug:
62445317
Test: m
Test: adb shell am start --attach-agent dummy.so
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsJvmtiAttachingHostTestCases
Change-Id: Ia16c2973b24f81839d20502339978e75a23a93bc
sergeyv [Thu, 14 Sep 2017 18:41:54 +0000 (11:41 -0700)]
Throw if BitmapFactory.Options.inBitmap is HARDWARE
Test: BitmapRegionDecoderTest#testHardwareBitmapIn
bug:
34415265
Change-Id: I58061504dd42ba918f89e1e5daf668f7601ca8d3
Hall Liu [Thu, 14 Sep 2017 20:11:32 +0000 (20:11 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations" am:
1bbf287859 am:
200d8f6242
am:
4de6420978
Change-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Chris Wren [Thu, 14 Sep 2017 20:06:33 +0000 (20:06 +0000)]
Merge "also log user-initiated notification collapse events" into oc-mr1-dev
am:
e72e8b1528
Change-Id: I7a65e5ac332cb5f9d0b6cad8cb346132dfe74949
Philip P. Moltmann [Thu, 14 Sep 2017 20:02:53 +0000 (20:02 +0000)]
Merge "Do not fail session.commit on current thread" into oc-mr1-dev
am:
304d267066
Change-Id: I1ed37d63e3ecd4041851d9de786dd21fd184264a
Hall Liu [Thu, 14 Sep 2017 19:57:36 +0000 (19:57 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations" am:
1bbf287859
am:
200d8f6242
Change-Id: Iebea130f19c60c407a95ff1c1a3f80abd7c66925
Chris Wren [Thu, 14 Sep 2017 19:55:32 +0000 (19:55 +0000)]
Merge "also log user-initiated notification collapse events" into oc-mr1-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 19:53:13 +0000 (19:53 +0000)]
Merge "Merge "Clear calling identity" into oc-mr1-dev am:
bc0c5882c6" into oc-mr1-dev-plus-aosp
Philip P. Moltmann [Thu, 14 Sep 2017 19:52:31 +0000 (19:52 +0000)]
Merge "Do not fail session.commit on current thread" into oc-mr1-dev
Julia Reynolds [Thu, 14 Sep 2017 19:51:45 +0000 (19:51 +0000)]
Merge "Clear calling identity" into oc-mr1-dev
am:
bc0c5882c6
Change-Id: I7c2099ce909f1bdfc0a862c4d25257e0f51a0025
Jakub Pawlowski [Thu, 14 Sep 2017 19:50:18 +0000 (19:50 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated" am:
1f53eb76e4 am:
8ab1ed1789
am:
dd71df9d41
Change-Id: I46d8cf106ed9c2b22e5dfc2b0a38588622c140e8
Julia Reynolds [Thu, 14 Sep 2017 19:46:37 +0000 (19:46 +0000)]
Merge "Display volume dialog for longer..." into oc-mr1-dev
am:
d5ca90a7af
Change-Id: I55c8feae01484de44f89fd75edd784e65e719c31
Hall Liu [Thu, 14 Sep 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
am:
1bbf287859
Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
Jakub Pawlowski [Thu, 14 Sep 2017 19:41:52 +0000 (19:41 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated" am:
1f53eb76e4
am:
8ab1ed1789
Change-Id: I534e04c709f6ee3f74358e9e1b3a30ad6cb64083
Beverly Tai [Thu, 14 Sep 2017 19:41:20 +0000 (19:41 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours am:
fe5ce91c5f -s ours
am:
9fbf077e80 -s ours
Change-Id: Ib4ccb0c44187f27c1643b94ceb95a6c46ec18dee
Jakub Pawlowski [Thu, 14 Sep 2017 18:54:59 +0000 (11:54 -0700)]
Fix included service parsing (3/3)
Bug:
65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c
Jakub Pawlowski [Thu, 14 Sep 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
am:
1f53eb76e4
Change-Id: I45642dfbb8ed8bb90a1306d066844d18aa1962b3
Hall Liu [Thu, 14 Sep 2017 19:35:23 +0000 (19:35 +0000)]
Merge "Unhide EMBMS download API" into oc-mr1-dev
am:
5dab2f297c -s ours
Change-Id: Ifa5e4aede36e590afd0afb86234793a5b0b11047
Hall Liu [Thu, 14 Sep 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
Julia Reynolds [Thu, 14 Sep 2017 19:26:25 +0000 (19:26 +0000)]
Merge "Clear calling identity" into oc-mr1-dev
Jakub Pawlowski [Thu, 14 Sep 2017 15:51:44 +0000 (08:51 -0700)]
Bluetooth: fix typo in comment
Test: none
Change-Id: I48c674049df88285268145d4140870eb4ab79a62
Jakub Pawlowski [Thu, 14 Sep 2017 19:24:06 +0000 (19:24 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
Jakub Pawlowski [Thu, 14 Sep 2017 15:24:15 +0000 (08:24 -0700)]
Bluetooth: fix parameter name in onConnectionUpdated
Test: compilation
Change-Id: I625e4ca63477b795310ebb42ca5e9a0549523cc5
Julia Reynolds [Thu, 14 Sep 2017 19:19:56 +0000 (19:19 +0000)]
Merge "Display volume dialog for longer..." into oc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 19:17:28 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours am:
fe5ce91c5f
am:
7c8a60c3e4 -s ours
Change-Id: Iddf985fd988f5a561b8211fb1df28b805319fe3d
Beverly [Thu, 24 Aug 2017 13:33:57 +0000 (09:33 -0400)]
Added SafetyNet logging for UsbDebugging security bug.
Bug:
62187985
Test: n/a
Change-Id: I69244381b2172357c5adc8785fc73d1cfd3cc17d
Beverly Tai [Thu, 14 Sep 2017 19:09:35 +0000 (19:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours
am:
fe5ce91c5f -s ours
Change-Id: I28bb498ea60d1a42d4b557f0b58c7134650bb3dd
Beverly Tai [Thu, 14 Sep 2017 19:09:03 +0000 (19:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours
am:
fe5ce91c5f
Change-Id: If9c65045e4810a08dc0a025ac740c5499547fd7e
Beverly Tai [Thu, 14 Sep 2017 19:00:40 +0000 (19:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
am:
d740b2d09a -s ours
Change-Id: I952391f1801cd678240b145971a733c755f62078
Evan Laird [Thu, 14 Sep 2017 18:52:53 +0000 (18:52 +0000)]
Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev
am:
a76a1e8842
Change-Id: Icb107684248f324722ce36da3ec63b4531ddf49f
Beverly Tai [Thu, 14 Sep 2017 18:49:00 +0000 (18:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 18:47:43 +0000 (18:47 +0000)]
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8" into oc-mr1-dev am:
2dfb1bab8d" into oc-mr1-dev-plus-aosp
Beverly Tai [Thu, 14 Sep 2017 18:44:46 +0000 (18:44 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8" into oc-mr1-dev
am:
2dfb1bab8d
Change-Id: Ibceb50b184f18164e6e3203f43c16ac267d83826
OSDN Git Service
