OSDN Git Service
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 [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
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
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"
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
Android Build Merger (Role) [Fri, 25 Aug 2017 22:15:15 +0000 (22:15 +0000)]
Merge "Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev am:
4aefa37d9e" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 25 Aug 2017 22:13:29 +0000 (22:13 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015 am:
d29128d699" into oc-mr1-dev-plus-aosp
Felipe Leme [Fri, 25 Aug 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev
am:
4aefa37d9e
Change-Id: Iac1cc5205d90e2cce2206585bcfba93ed737a58a
Android Build Merger (Role) [Fri, 25 Aug 2017 22:05:23 +0000 (22:05 +0000)]
Merge "Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev am:
9938901bbc" into oc-mr1-dev-plus-aosp
Felipe Leme [Fri, 25 Aug 2017 22:05:01 +0000 (22:05 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015
am:
d29128d699
Change-Id: If8eae5bc9f2985c913179b2fc881d7bf03510276
Brad Ebinger [Fri, 25 Aug 2017 22:01:06 +0000 (22:01 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev
am:
9938901bbc
Change-Id: I7b576ee7e38f141075cae094e3d1f74b7145d53f
Android Build Merger (Role) [Fri, 25 Aug 2017 22:00:15 +0000 (22:00 +0000)]
Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am:
feb69bf5a7 am:
3825027579" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 25 Aug 2017 21:58:11 +0000 (21:58 +0000)]
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df am:
da31220015" into oc-mr1-dev
Adrian Roos [Fri, 25 Aug 2017 21:57:07 +0000 (21:57 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am:
feb69bf5a7
am:
3825027579
Change-Id: I2cb07ff584d6b69bcdec6138558e7481787b2bf1
Felipe Leme [Fri, 25 Aug 2017 21:55:40 +0000 (21:55 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df
am:
da31220015
Change-Id: I2a928f1e1c0e7fba03c1ebc8c61a182ecebb32c0
TreeHugger Robot [Fri, 25 Aug 2017 21:55:05 +0000 (21:55 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev
Felipe Leme [Fri, 25 Aug 2017 21:54:45 +0000 (21:54 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am:
7d29b6f2df
am:
da31220015
Change-Id: I1ccd7b54c27ce65edcf9b1aceba7097bd8fc32e2
Adrian Roos [Fri, 25 Aug 2017 21:53:06 +0000 (21:53 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am:
feb69bf5a7
am:
7835aad0f6
Change-Id: I83bb60945c507ffa4e509306f3d2517620f41668
Adrian Roos [Fri, 25 Aug 2017 21:45:36 +0000 (21:45 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev
am:
feb69bf5a7
Change-Id: I14d244bc7cc413ff204d37dee6d621af9e0e8e29
Adrian Roos [Fri, 25 Aug 2017 21:39:16 +0000 (21:39 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev
am:
feb69bf5a7
Change-Id: I3214a82b85f85f3ae23ae1cab22ece815020af1e
Felipe Leme [Fri, 25 Aug 2017 21:36:04 +0000 (21:36 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
am:
7d29b6f2df
Change-Id: Ibfabc9d32aa0da80e636a27eebf1b50bdd9692b3
TreeHugger Robot [Fri, 25 Aug 2017 21:27:56 +0000 (21:27 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
TreeHugger Robot [Fri, 25 Aug 2017 21:25:02 +0000 (21:25 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev
Michael Wright [Fri, 25 Aug 2017 21:02:36 +0000 (21:02 +0000)]
Merge "Add new system API for stable display size" into oc-mr1-dev
am:
c217d744b4
Change-Id: I25a68c0bf9eecd1dbe878851a62926520d4ea71a
TreeHugger Robot [Fri, 25 Aug 2017 20:56:57 +0000 (20:56 +0000)]
Merge "Add new system API for stable display size" into oc-mr1-dev
Brad Ebinger [Fri, 25 Aug 2017 20:56:03 +0000 (20:56 +0000)]
Merge "Emergency redial implementation" am:
b3b09849bc am:
f5a457244c
am:
1d8a6e4ee7
Change-Id: I8689b700ff77127534d5560fac1d849615e8f567
Michael Wright [Wed, 16 Aug 2017 22:14:54 +0000 (23:14 +0100)]
Add new system API for stable display size
Fixes:
34388294
Test: manual
Change-Id: Ie380230bbd82370f507161b4cdb6f0d100b09f11
Brad Ebinger [Fri, 25 Aug 2017 20:45:04 +0000 (20:45 +0000)]
Merge "Emergency redial implementation" am:
b3b09849bc
am:
f5a457244c
Change-Id: Ied2aa7255546df647b01884b6c1689c6192e1d67
Stephen Chen [Fri, 25 Aug 2017 20:37:34 +0000 (20:37 +0000)]
Merge "Use a LruCache in WifiNetworkScoreCache." into oc-mr1-dev
am:
c9ae7df52a
Change-Id: Ib3b7933a7ba6dd17513e1da13099fd4c2bd4f5a2
Brad Ebinger [Fri, 25 Aug 2017 20:31:26 +0000 (20:31 +0000)]
Merge "Emergency redial implementation"
am:
b3b09849bc
Change-Id: If7fe179da4eb4c639dad1e2957f091bbee9e54f9
TreeHugger Robot [Fri, 25 Aug 2017 20:29:32 +0000 (20:29 +0000)]
Merge "Use a LruCache in WifiNetworkScoreCache." into oc-mr1-dev
Makoto Onuki [Fri, 25 Aug 2017 20:26:04 +0000 (20:26 +0000)]
Merge "SyncManager: Log # of jobs loaded, and saved most recently." into oc-mr1-dev
am:
3cbe06791b
Change-Id: Icbaf28d262e423fd4a759d6380dfa4d1e5e4d008
Roger 1 Jönsson [Wed, 17 May 2017 12:21:55 +0000 (14:21 +0200)]
Create new trace object when logging from new thread
Create new BootTimingsTraceLog object for logging when starting HIDL
services from different thread, in order to avoid exception.
Bug:
64111691
Test: Manual - device boots, metrics are logged to system/event log
Change-Id: I05834b7fe8078fbf772f9b29f0dd3aa4288f8f23
TreeHugger Robot [Fri, 25 Aug 2017 20:18:52 +0000 (20:18 +0000)]
Merge "SyncManager: Log # of jobs loaded, and saved most recently." into oc-mr1-dev
Santos Cordon [Fri, 25 Aug 2017 20:18:50 +0000 (20:18 +0000)]
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev
am:
0405d12a31
Change-Id: I8a9c7b921489d12f8b9822d4d2b3b53d17368802
TreeHugger Robot [Fri, 25 Aug 2017 20:13:31 +0000 (20:13 +0000)]
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev
Brad Ebinger [Fri, 25 Aug 2017 20:05:53 +0000 (20:05 +0000)]
Merge "Emergency redial implementation"
Felipe Leme [Fri, 25 Aug 2017 20:05:09 +0000 (20:05 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev am:
560221752e am:
948e9ff4d3
am:
6660644576
Change-Id: If0ead77d654df02f87f8878d8c800a207d6900ce
Jason Monk [Fri, 25 Aug 2017 19:56:03 +0000 (15:56 -0400)]
Roll back nav bar interface to version 2
Partial revert of If27641aedcd05ebc834c9dc0b38d18cd20ddae03
Test: make
Change-Id: I47de1ca026028e16e6c4075e6be5b18a9746962c
Fixes:
65055647
Felipe Leme [Fri, 25 Aug 2017 19:56:01 +0000 (19:56 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev am:
560221752e am:
948e9ff4d3
am:
017c0192d7
Change-Id: I581283831c31705ac2dbb344eb1e0bdc0d25e396
Felipe Leme [Fri, 25 Aug 2017 19:48:51 +0000 (19:48 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev am:
560221752e
am:
948e9ff4d3
Change-Id: I322ab59aa9600b7deb5a48f2e6fc6e012053b8f3
Felipe Leme [Fri, 25 Aug 2017 19:47:23 +0000 (19:47 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev am:
560221752e
am:
948e9ff4d3
Change-Id: I90a42739dfa01c49fdbf799c49e3d569abcedf11
Felipe Leme [Fri, 25 Aug 2017 19:36:56 +0000 (19:36 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
am:
560221752e
Change-Id: Ib2924dae99bfe132a56a1583ecf4a88f833d3937
Selim Cinek [Fri, 25 Aug 2017 19:33:07 +0000 (19:33 +0000)]
Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev
am:
02f8fa9603
Change-Id: Ic46388c35651217b7f39b12aec8ba1a34f537d36
TreeHugger Robot [Fri, 25 Aug 2017 19:13:44 +0000 (19:13 +0000)]
Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 19:12:22 +0000 (19:12 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
Shuo Qian [Fri, 25 Aug 2017 18:51:44 +0000 (18:51 +0000)]
Merge "Add new error code in SmsManager" am:
387ed22fef am:
782395561d
am:
6fab5790bf -s ours
Change-Id: I99e7acc32497a0c78ac30090d5f34c897921f908
jackqdyulei [Fri, 25 Aug 2017 18:37:35 +0000 (18:37 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
am:
c3321c813c
Change-Id: I7934edf2cb6a96edc37877897d0f10565a8d6af5
Shuo Qian [Fri, 25 Aug 2017 18:35:16 +0000 (18:35 +0000)]
Merge "Add new error code in SmsManager" am:
387ed22fef
am:
782395561d
Change-Id: I12924c377167e11889942f2bfba555a07b45d9ac
TreeHugger Robot [Fri, 25 Aug 2017 18:25:01 +0000 (18:25 +0000)]
Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
Fyodor Kupolov [Fri, 25 Aug 2017 18:23:02 +0000 (11:23 -0700)]
Use synchronization when accessing mPackages state
In the context of this bug, enableComponentLPw was concurrently
modifying arraylist.
Test: manual - multiple reboots
Bug:
64986285
Change-Id: Ifab137c9572a2eb4ec7417309f6674a08425833c
Shuo Qian [Fri, 25 Aug 2017 18:15:12 +0000 (18:15 +0000)]
Merge "Add new error code in SmsManager"
am:
387ed22fef
Change-Id: Iff96995b90ecd6ae7fcceebf6b2017344038be72
Makoto Onuki [Thu, 24 Aug 2017 21:23:36 +0000 (14:23 -0700)]
SyncManager: Log # of jobs loaded, and saved most recently.
Also moved the "wtf for cancelAll for the system UID" code to catch
other entry points.
Bug:
64536115
Test: Manual
Change-Id: I55ff515ad70263d6f953f18d6be02f6292742efa
Shuo Qian [Fri, 25 Aug 2017 18:01:18 +0000 (18:01 +0000)]
Merge "Add new error code in SmsManager"
Erik Kline [Thu, 24 Aug 2017 05:21:57 +0000 (22:21 -0700)]
switch to native_handle_create() for passing ownership
Test: builds
Bug:
29337859
Bug:
32163131
Bug:
64976634
Change-Id: Ifd064736c9fcb633b72e56e93b7baa5f4a5ff051
Winson Chung [Tue, 22 Aug 2017 18:32:16 +0000 (11:32 -0700)]
Add API to disallow entering PiP when launching a new activity
- Use this API when launching the camera from a double tap gesture where
the user expects the camera to start for immediate use.
- Fix missing case of restoring the enter pip state.
Bug:
63916952
Test: Double tap to launch the camera, and ensure it does not trigger
the current activity to enter PiP (if it supports it)
Change-Id: I2acf44984bcc57dff75701d0e9cbd6b798a97cd8
Srikanth Chintala [Thu, 4 May 2017 15:28:34 +0000 (20:58 +0530)]
Emergency redial implementation
Define connection event to notify
Telecom/InCallUi about change in
account handle after redial and extra
for emergency phone handle.
Bug:
27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
Andrii Kulian [Fri, 25 Aug 2017 16:56:36 +0000 (16:56 +0000)]
Merge "Check permission for activity embedding" into oc-mr1-dev
am:
87ad0f7f40
Change-Id: I61855e252badff840acc78e3894695951e09d3fe
Andrii Kulian [Fri, 25 Aug 2017 16:49:26 +0000 (16:49 +0000)]
Merge "Check permission for activity embedding" into oc-mr1-dev
OSDN Git Service
