OSDN Git Service
Hugo Benichi [Tue, 29 Aug 2017 05:42:07 +0000 (05:42 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am:
91817b3129 am:
02f6cfa49e
am:
f55c1ae9b6
Change-Id: I9116a493ca1cbdf6a25664a1b0017aa6c9b38eb4
Hugo Benichi [Tue, 29 Aug 2017 05:31:38 +0000 (05:31 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am:
91817b3129
am:
02f6cfa49e
Change-Id: Ib224392c9a185f6bd79fd60cd5cb5549f2a7851e
Hugo Benichi [Tue, 29 Aug 2017 05:20:32 +0000 (05:20 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
am:
91817b3129
Change-Id: I2f002cd197e2eeaaadadd747a6b33d264cd34433
Hugo Benichi [Tue, 29 Aug 2017 05:08:00 +0000 (05:08 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
Felipe Leme [Tue, 29 Aug 2017 03:24:00 +0000 (03:24 +0000)]
Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
am:
55309e79cf
Change-Id: I77d7a6e10d33b5e983d7652613c752829a886b01
TreeHugger Robot [Tue, 29 Aug 2017 03:13:57 +0000 (03:13 +0000)]
Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
Svetoslav Ganov [Tue, 29 Aug 2017 01:08:57 +0000 (01:08 +0000)]
Merge "Grant location to default launcher" into oc-mr1-dev
am:
25e5a3446e
Change-Id: I25f08bcfd2d0774800f975cde195bc01f23734a9
Felipe Leme [Thu, 3 Aug 2017 21:27:57 +0000 (14:27 -0700)]
Hides the Save UI while handling a pending intent from CustomDescription.
When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.
That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.
Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes:
64309238
Svetoslav Ganov [Tue, 29 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "Grant location to default launcher" into oc-mr1-dev
Colin Cross [Tue, 29 Aug 2017 00:38:13 +0000 (00:38 +0000)]
Merge "Use guava 21.0" am:
edb2e0c722 am:
f1c99fb47f
am:
a119b38d9e
Change-Id: If9ac959f83de3627ff9950ee727acb3ab07c7b9c
Colin Cross [Tue, 29 Aug 2017 00:15:35 +0000 (00:15 +0000)]
Merge "Use guava 21.0" am:
edb2e0c722
am:
f1c99fb47f
Change-Id: I8349115cf2b7678ac6e24ea2aa06ed59bffa5930
Colin Cross [Tue, 29 Aug 2017 00:03:24 +0000 (00:03 +0000)]
Merge "Use guava 21.0"
am:
edb2e0c722
Change-Id: Icf8873b268677a631659a7ee0f7816495f6acd38
Hugo Benichi [Wed, 5 Jul 2017 02:08:48 +0000 (11:08 +0900)]
Nat464Xlat: interface notification handler on ConnectivityService
This patch adds a layer of asynchonicity to the NetworkBaseObserver
callbacks implemented by Nat464Xlat in order to allow these callbacks
to run on the main ConnectivityService handler.
This allows to run interfaceLinkStateChanged and interfaceRemoved
callbacks in the same thread context as other Nat464Xlat methods and
solves the following issues:
- NPE risk due to race between fixupLinkProperties called on the
ConnectivityService thread and interfaceRemoved called as a
callback by NetworkManagementService.
- stale LinkProperties reads in both callbacks not called on
ConnectivityService handler.
- removes the race between stop() and interfaceRemoved().
This patch also:
- removes/simplifies comments related to the threading
model which are no obsolete.
- extract clatd management logic from ConnectivityService into
NetworkAgentInfo
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I889d98e47423ff3d4746d6ed8015b265286e7c52
Colin Cross [Mon, 28 Aug 2017 23:50:52 +0000 (23:50 +0000)]
Merge "Use guava 21.0"
Zheng Zhang [Mon, 28 Aug 2017 23:39:26 +0000 (23:39 +0000)]
Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider" into oc-mr1-dev
am:
61492c85ba
Change-Id: I7e3e6413d6edab90ae4ebd38d49aaf6157aed26c
Matthew Ng [Mon, 28 Aug 2017 23:33:36 +0000 (23:33 +0000)]
Merge "Low ram devices recents list is throwable" into oc-mr1-dev
am:
b49fa21828
Change-Id: Id97947d9f2d06c21777750ca17d877f6a13fbdf7
TreeHugger Robot [Mon, 28 Aug 2017 23:20:18 +0000 (23:20 +0000)]
Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider" into oc-mr1-dev
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
For non-master branch, only listen to Bluetooth on wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Merged-In: I30e39943220597987320ea7843d7d36827fdd0c7
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit
d6886710b5c9ed9d1567c4ee59773071bae7070c)
Hugo Benichi [Mon, 28 Aug 2017 23:12:13 +0000 (23:12 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum" am:
aee703e7e4 am:
20d4df8cc1
am:
68c8b4ad5d
Change-Id: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00
TreeHugger Robot [Mon, 28 Aug 2017 23:07:50 +0000 (23:07 +0000)]
Merge "Low ram devices recents list is throwable" into oc-mr1-dev
Hugo Benichi [Mon, 28 Aug 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum" am:
aee703e7e4
am:
20d4df8cc1
Change-Id: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6
Android Build Merger (Role) [Mon, 28 Aug 2017 22:54:10 +0000 (22:54 +0000)]
Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am:
f3f7a101fb" into oc-mr1-dev-plus-aosp
Hugo Benichi [Mon, 28 Aug 2017 22:49:50 +0000 (22:49 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
am:
aee703e7e4
Change-Id: I188ac4c367db11cb33b67fe92df3a120e3c6fbce
Winson Chung [Mon, 28 Aug 2017 22:48:45 +0000 (22:48 +0000)]
Merge "Bump special windows layer adjustment" into oc-mr1-dev
am:
f3f7a101fb
Change-Id: I233c1302fd7f86854255e64c06ef5c5130f77a29
bokyung.kim [Mon, 28 Aug 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Fixed mimetype error of PPT file" am:
3c28e2b280 am:
148414cd2c
am:
1190da1b1e
Change-Id: I0eb5f50a6ac95d5512fbae9888b37a3c64917902
bokyung.kim [Mon, 28 Aug 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Fixed mimetype error of PPT file" am:
3c28e2b280
am:
148414cd2c
Change-Id: I73f527fd006a39f00dafbe0b8c85cd583cf283f7
TreeHugger Robot [Mon, 28 Aug 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Bump special windows layer adjustment" into oc-mr1-dev
Hugo Benichi [Mon, 28 Aug 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
bokyung.kim [Mon, 28 Aug 2017 22:27:38 +0000 (22:27 +0000)]
Merge "Fixed mimetype error of PPT file"
am:
3c28e2b280
Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
Treehugger Robot [Mon, 28 Aug 2017 22:12:37 +0000 (22:12 +0000)]
Merge "Fixed mimetype error of PPT file"
Svet Ganov [Mon, 28 Aug 2017 19:39:35 +0000 (12:39 -0700)]
Grant location to default launcher
Test: updated DefaultPermissionGrantPolicy test which passes
bug:
62959599
Change-Id: Ifaac04758348049dd170a7e7b7ac234dced5f759
Android Build Merger (Role) [Mon, 28 Aug 2017 20:48:29 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE am:
e0fec63824 -s ours am:
156955898f -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 28 Aug 2017 20:45:02 +0000 (20:45 +0000)]
Import translations. DO NOT MERGE am:
e0fec63824 -s ours
am:
156955898f -s ours
Change-Id: I5b5e2db47336ca156750b0f476dc1915b6743afa
Bill Yi [Mon, 28 Aug 2017 20:40:58 +0000 (20:40 +0000)]
Import translations. DO NOT MERGE am:
e0fec63824 -s ours
am:
b22505ca14 -s ours
Change-Id: I3207da4df3a1086a3ad218054734f12b95c4fbed
Bill Yi [Mon, 28 Aug 2017 20:29:53 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE
am:
e0fec63824 -s ours
Change-Id: I6c1b10a7eef1aa0b75bff31db698d7601ae89ead
Bill Yi [Mon, 28 Aug 2017 20:23:48 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
e0fec63824 -s ours
Change-Id: Iac255ef2407c7e3ff393fb01124d9a052bcde728
xulicheng [Mon, 28 Aug 2017 20:21:45 +0000 (20:21 +0000)]
Merge "Ensure the generation is not changed before put value to cache" am:
11ae580f81 am:
489f2c2c48
am:
848cde3beb
Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2
bokyung.kim [Wed, 26 Jul 2017 01:18:39 +0000 (10:18 +0900)]
Fixed mimetype error of PPT file
Change mimetype of PPT file to match MS specification.
(MimeUtils.java matched the MS specification)
Test: Check mimetype of DB after saving PPT file.
Change-Id: Ie559499ae39bc527fcc656ba37f28845af209e6c
Signed-off-by: bokyung.kim <bokyung.kim@lge.com>
xulicheng [Mon, 28 Aug 2017 20:11:08 +0000 (20:11 +0000)]
Merge "Ensure the generation is not changed before put value to cache" am:
11ae580f81
am:
489f2c2c48
Change-Id: Idab1a2d1f4ee8cc28a38c3c82ea9a8ad7f9d3bf4
xulicheng [Mon, 28 Aug 2017 19:58:06 +0000 (19:58 +0000)]
Merge "Ensure the generation is not changed before put value to cache"
am:
11ae580f81
Change-Id: I5bf2c557f6f46f1455204761a9045b8b90d7ea32
Eugene Susla [Mon, 28 Aug 2017 19:55:47 +0000 (19:55 +0000)]
Merge "Avoid running hasCompanionDevices on main thread" into oc-mr1-dev
am:
933108ed14
Change-Id: I244acf8ad34e1e2098c996b7e5c5549fdac4abfd
Nate Fischer [Mon, 28 Aug 2017 19:49:26 +0000 (19:49 +0000)]
Merge "WebView: require APKs to target OMR1" into oc-mr1-dev
am:
c233f44a26
Change-Id: I54f07a5f3672af8fa953b0861bcf2be4b90d0ac6
Eugene Susla [Mon, 28 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "Avoid running hasCompanionDevices on main thread" into oc-mr1-dev
Treehugger Robot [Mon, 28 Aug 2017 19:42:11 +0000 (19:42 +0000)]
Merge "Ensure the generation is not changed before put value to cache"
Nate Fischer [Mon, 28 Aug 2017 19:36:29 +0000 (19:36 +0000)]
Merge "WebView: require APKs to target OMR1" into oc-mr1-dev
Ajay Panicker [Mon, 28 Aug 2017 19:34:07 +0000 (19:34 +0000)]
Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev
am:
619503b279
Change-Id: Id148586a545c653dc57768533da9a066c1e7a662
TreeHugger Robot [Mon, 28 Aug 2017 19:26:41 +0000 (19:26 +0000)]
Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev
Nate Fischer [Mon, 28 Aug 2017 19:15:56 +0000 (12:15 -0700)]
WebView: require APKs to target OMR1
This disallows WebView/Monochrome APKs targeting O or below to be chosen
as WebView providers.
Bug:
65080651
Test: Open WebView shell with webview from system image, no crash
Test: Install Monochrome compiled for O, it's not in the webview provider list
Change-Id: I79162cedaa801ce227ad4c2eb3cbea9c08704da8
Fyodor Kupolov [Mon, 28 Aug 2017 18:50:48 +0000 (18:50 +0000)]
Merge "Added tron metrics for shutdown time" into oc-mr1-dev
am:
30c565d399
Change-Id: I10d4479c79c1997325f74477a94e4f74eb043f46
Fyodor Kupolov [Mon, 28 Aug 2017 18:41:52 +0000 (18:41 +0000)]
Merge "Added tron metrics for shutdown time" into oc-mr1-dev
Dan Sandler [Mon, 28 Aug 2017 18:04:22 +0000 (18:04 +0000)]
Merge "Remove extra horz padding on GlobalActions labels." into oc-mr1-dev
am:
0fe2910c37
Change-Id: Ie21704d19dacd062b96538b7784566f193ef7425
TreeHugger Robot [Mon, 28 Aug 2017 17:52:08 +0000 (17:52 +0000)]
Merge "Remove extra horz padding on GlobalActions labels." into oc-mr1-dev
Jean-Michel Trivi [Mon, 28 Aug 2017 16:38:41 +0000 (16:38 +0000)]
Merge "AudioManager: permission annotations" into oc-mr1-dev
am:
72cf1a4fa2
Change-Id: I27394a0801a9d5d31d4ac18b3b773268b6d2fa10
Jean-Michel Trivi [Mon, 28 Aug 2017 16:27:27 +0000 (16:27 +0000)]
Merge "AudioManager: permission annotations" into oc-mr1-dev
Julia Reynolds [Mon, 28 Aug 2017 15:08:33 +0000 (15:08 +0000)]
Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev
am:
b6cf707632
Change-Id: Id161a3fd805c7554ebb1799a358354e719ebde10
TreeHugger Robot [Mon, 28 Aug 2017 15:00:48 +0000 (15:00 +0000)]
Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev
Lorenzo Colitti [Mon, 28 Aug 2017 13:08:37 +0000 (13:08 +0000)]
Merge "Trivial change to test expectations." am:
c0d8300b32 am:
3dd0137ee5
am:
7da529950c
Change-Id: Id37a48a7a27a6e2550824873ea376e16b3c949b2
Lorenzo Colitti [Mon, 28 Aug 2017 12:58:30 +0000 (12:58 +0000)]
Merge "Trivial change to test expectations." am:
c0d8300b32
am:
3dd0137ee5
Change-Id: I40e6535b22688b47845e6c57d3f13963bc8a6201
Lorenzo Colitti [Mon, 28 Aug 2017 12:49:29 +0000 (12:49 +0000)]
Merge "Trivial change to test expectations."
am:
c0d8300b32
Change-Id: I58155e3edb424ea6918a3d2bb8e284e61346765f
Treehugger Robot [Mon, 28 Aug 2017 12:39:29 +0000 (12:39 +0000)]
Merge "Trivial change to test expectations."
Hugo Benichi [Mon, 28 Aug 2017 12:21:10 +0000 (12:21 +0000)]
Merge "Nat464Xlat: clat management cleanup" am:
81b179cfdd am:
b6805dc02f
am:
da71487a59
Change-Id: I06661bd6bd1456ba34a3bbdb52c120ac01da9d61
Hugo Benichi [Mon, 28 Aug 2017 12:11:28 +0000 (12:11 +0000)]
Merge "Nat464Xlat: clat management cleanup" am:
81b179cfdd
am:
b6805dc02f
Change-Id: I1a19e6fbb0cb13262e90b171d861062469078fb6
Hugo Benichi [Mon, 28 Aug 2017 12:01:25 +0000 (12:01 +0000)]
Merge "Nat464Xlat: clat management cleanup"
am:
81b179cfdd
Change-Id: Ic3808a1afe48efac745b1b378fb12cc5678918ec
Hugo Benichi [Mon, 28 Aug 2017 11:47:08 +0000 (11:47 +0000)]
Merge "Nat464Xlat: clat management cleanup"
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.
(cherry picked from commit
0fee732ca579bbc4320ade35f238bdfa1aa500f5)
Bug:
32163131
Test: runtest frameworks-net
Change-Id: Iec8af5191b4da495e47ef97d70a03a5d2e75cfe2
Lorenzo Colitti [Mon, 28 Aug 2017 08:29:52 +0000 (08:29 +0000)]
Merge "switch to native_handle_create() for passing ownership" am:
5fe8e51904 am:
639808f1c7
am:
b3a345b893
Change-Id: Id7a525424ecb35ee857af271873a939d1c032df7
Lorenzo Colitti [Mon, 28 Aug 2017 08:20:15 +0000 (08:20 +0000)]
Merge "switch to native_handle_create() for passing ownership" am:
5fe8e51904
am:
639808f1c7
Change-Id: I3bd8f99cc3c1a6bc435721c7dc18e061f61fc175
Lorenzo Colitti [Mon, 28 Aug 2017 08:11:20 +0000 (08:11 +0000)]
Merge "switch to native_handle_create() for passing ownership"
am:
5fe8e51904
Change-Id: I101de0e7e76f61bd3f05183f4a13ac94c79ae1aa
Lorenzo Colitti [Mon, 28 Aug 2017 08:02:19 +0000 (08:02 +0000)]
Merge "switch to native_handle_create() for passing ownership"
Erik Kline [Mon, 28 Aug 2017 07:02:02 +0000 (07:02 +0000)]
Merge "switch to native_handle_create() for passing ownership" into oc-mr1-dev
am:
91f4071ff6
Change-Id: Ic834e09970fc08036807f914b23016b897e5282f
TreeHugger Robot [Mon, 28 Aug 2017 06:47:52 +0000 (06:47 +0000)]
Merge "switch to native_handle_create() for passing ownership" into oc-mr1-dev
Hugo Benichi [Thu, 29 Jun 2017 05:04:13 +0000 (14:04 +0900)]
Nat464Xlat: internal state guards cleanup + state enum
This patch does some cleanup of Nat464Xlat internal state guards
against the Nat464Xlat state Idle | Started | Running, which reduces
code nesting.
It also replaces introspection of internal state for distinguishing
between different stages in 464xlat lifecycle with an enum explicitly
introducing these three Idle | Started | Running states.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I6efc9fed2420ca488731a2b9b9c3c025b16eca10
Hugo Benichi [Tue, 27 Jun 2017 06:13:20 +0000 (15:13 +0900)]
Nat464Xlat: clat management cleanup
This patch does some minor refactoring of clat starting/stopping code:
- remove unused LinkProperties arguments in updateClat
- remove unused Context argument in Nat464Xlat ctor
- introduce ensureClatIsStarted and ensureClatIsStopped methods and
simplify updateClat
- add clatd to NetworkAgentInfo toString() method
- clarify some comments
This changes prepare for moving BaseNetworkObserver callbacks to
ConnectivityService.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to IPv6 only network and went to test-ipv6.com
Change-Id: Idb204784614cfe700f73255a7a7b78c5e9ee6eca
Bill Yi [Sun, 27 Aug 2017 18:43:06 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ida2b6138972c18c15b86e7822d010c4a675ab762
Siarhei Vishniakou [Sat, 26 Aug 2017 11:33:16 +0000 (11:33 +0000)]
Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev
am:
d7d9b8939e
Change-Id: I4bb5e08e8019527bd5a3847ae32798187e0a4b0a
TreeHugger Robot [Sat, 26 Aug 2017 11:26:42 +0000 (11:26 +0000)]
Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev
Winson Chung [Sat, 26 Aug 2017 06:30:34 +0000 (06:30 +0000)]
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev
am:
3ea1e3d57d
Change-Id: I82384a2fb55e4f66e627a9e70f729fb5a2bff8a1
TreeHugger Robot [Sat, 26 Aug 2017 06:22:34 +0000 (06:22 +0000)]
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev
Siarhei Vishniakou [Sat, 26 Aug 2017 04:44:01 +0000 (21:44 -0700)]
DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel
CREATE2 structs were introduced after kernel 3.18,
so cannot compile user code with uapi headers from
newer 3.18+ kernels. If using CREATE structs then
compatibility is preserved.
Bug:
64981084
Test: bit
Change-Id: I97c7725918b09a817a51c13384ac2d55a6cfab25
CtsHardwareTestCases:android.hardware.input.cts.tests.GamepadTestCase
Jack He [Sat, 26 Aug 2017 02:51:31 +0000 (02:51 +0000)]
Merge "Bluetooth: Add developer options to show devices without names" into oc-mr1-dev
am:
4ce5d83e52
Change-Id: I167d81324b09e7b10ccaa23f59167533fa4db815
Michael Wright [Sat, 26 Aug 2017 02:41:46 +0000 (02:41 +0000)]
Merge "O MR1 is API 27" into oc-mr1-dev
am:
d489d122f4
Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df
TreeHugger Robot [Sat, 26 Aug 2017 02:37:54 +0000 (02:37 +0000)]
Merge "Bluetooth: Add developer options to show devices without names" into oc-mr1-dev
TreeHugger Robot [Sat, 26 Aug 2017 02:29:51 +0000 (02:29 +0000)]
Merge "O MR1 is API 27" into oc-mr1-dev
Jean-Michel Trivi [Sat, 26 Aug 2017 02:20:49 +0000 (19:20 -0700)]
AudioManager: permission annotations
Add permission annotations on audio focus @SystemApi methods.
Ignore REQUIRE_PERMISSION error (125) for:
- deprecated abandonAudioFocus() method: the check is on the
request call
- isHdmiSystemAudioSupported() method, it's not clear if it's
being used.
Test: remove "-hide 125" in Android.mk and make, verify no errors\
on AudioManager.java
Bug:
62343127
Change-Id: I62526db0c6dabcc34224c589506d611519de6abc
Eugene Susla [Thu, 24 Aug 2017 18:28:08 +0000 (11:28 -0700)]
Avoid running hasCompanionDevices on main thread
Fixes:
63348899,
63309685
Test: Ensure b/
63348899 doesn't reproduce
Change-Id: I93717bf7c3fab2ca32ec7cedf1cbd64fe1b6bbf2
Selim Cinek [Sat, 26 Aug 2017 01:07:36 +0000 (01:07 +0000)]
Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev
am:
77af296764
Change-Id: I7e54e439ec68a5a6d329492d4a3c135528fed5e1
TreeHugger Robot [Sat, 26 Aug 2017 01:00:38 +0000 (01:00 +0000)]
Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev
Yongqin Liu [Sat, 26 Aug 2017 00:56:15 +0000 (00:56 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" am:
b5b1308f2f am:
c54162d3ff
am:
d395b2f497
Change-Id: I9e45b3958009dd01adbbf527b8b8edb98a0ba4a4
Yongqin Liu [Sat, 26 Aug 2017 00:46:07 +0000 (00:46 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" am:
b5b1308f2f
am:
c54162d3ff
Change-Id: Ie9225108f7ac354212a186d2e26d1f278d9fb7e8
Yongqin Liu [Sat, 26 Aug 2017 00:36:54 +0000 (00:36 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang"
am:
b5b1308f2f
Change-Id: I05f37f0ca0a18bd291aea8d49e2747b40d30b572
Treehugger Robot [Sat, 26 Aug 2017 00:24:23 +0000 (00:24 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang"
Fyodor Kupolov [Fri, 25 Aug 2017 23:59:08 +0000 (16:59 -0700)]
Added tron metrics for shutdown time
The metrics are persisted in /data/system/shutdown-metrics.txt file
property and logged after reboot. MetricsLogger API cannot be directly
used during shutdown since event log is cleared on reboot/power off.
Test: manual reboot/shutdown and verify that metrics are logged
Bug:
64815357
Change-Id: I7fa1af8be58a80a3d5bae26d55c1ed40bf98f4c0
Jack He [Thu, 24 Aug 2017 22:21:40 +0000 (15:21 -0700)]
Bluetooth: Add developer options to show devices without names
* Bluetooth developer can enable it to pair with and send file to
devices without names
Bug:
34685932
Test: make, RunSettingsLibRoboTest, RunSettingsRoboTest, pair with
devices
Change-Id: I529609008f9ba69bda47d8b6d8c434a70f9de491
Roger 1 Jönsson [Fri, 25 Aug 2017 23:13:00 +0000 (23:13 +0000)]
Merge "Create new trace object when logging from new thread" into oc-mr1-dev
am:
071edf5b09
Change-Id: I7b0c2521a3e010b9ddcc316ff59c97b42888d94c
TreeHugger Robot [Fri, 25 Aug 2017 23:04:46 +0000 (23:04 +0000)]
Merge "Create new trace object when logging from new thread" into oc-mr1-dev
Jason Monk [Fri, 25 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Roll back nav bar interface to version 2" into oc-mr1-dev
am:
e2a372075d
Change-Id: I5c19b76cb21b6c65be8b3b243ef9e529968d7d59
TreeHugger Robot [Fri, 25 Aug 2017 22:50:03 +0000 (22:50 +0000)]
Merge "Roll back nav bar interface to version 2" into oc-mr1-dev
Selim Cinek [Fri, 25 Aug 2017 22:07:36 +0000 (22:07 +0000)]
Revert "Support keyboard long-press on notifications"
This reverts commit
2ca798932ea2945184df1c5500b5b9f08af9af55.
Fixes:
65061056
Change-Id: I88bcb549b9e76958d280625a96796791b6f29060
Fyodor Kupolov [Fri, 25 Aug 2017 22:30:20 +0000 (22:30 +0000)]
Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev
am:
9d656d0305
Change-Id: I78cb61a5bc667fe2d902b49e292968941251cdc6
TreeHugger Robot [Fri, 25 Aug 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev