OSDN Git Service
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
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"
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
Selim Cinek [Thu, 10 Aug 2017 18:17:39 +0000 (11:17 -0700)]
Fixed that the status icons were showing in the camera
When launching to quicksettings, the camera icons showed
above the camera, clashing with their UI
Test: launch camera (locked) and click on galery
Fixes:
64317909
Change-Id: I4ef68963af11f6d0be739c79cdf352ba35d9ece0
Chavi Weingarten [Fri, 25 Aug 2017 16:40:02 +0000 (16:40 +0000)]
Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
am:
f9c0f06526
Change-Id: I5e683ce2a92b195804b883cce425200180130815
Chavi Weingarten [Fri, 25 Aug 2017 16:28:14 +0000 (16:28 +0000)]
Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
Mark Salyzyn [Fri, 25 Aug 2017 14:47:40 +0000 (14:47 +0000)]
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am:
0172ce8dbf am:
cf5fa80fbf
am:
7be29cab70
Change-Id: I0c10c44b33af31a0fcae30c2f617dd832788899e
Mark Salyzyn [Fri, 25 Aug 2017 14:37:35 +0000 (14:37 +0000)]
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am:
0172ce8dbf
am:
cf5fa80fbf
Change-Id: Ica26cd9240a977d9140c72f5606c8b9d874001d9
Mark Salyzyn [Fri, 25 Aug 2017 14:25:41 +0000 (14:25 +0000)]
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property"
am:
0172ce8dbf
Change-Id: I69a9c17fc8594dee564e8c64e9d85f2afe60607b
Mark Salyzyn [Fri, 25 Aug 2017 14:16:12 +0000 (14:16 +0000)]
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property"
Selim Cinek [Fri, 25 Aug 2017 03:48:45 +0000 (03:48 +0000)]
Merge "Not hinting anymore when in power saver" into oc-mr1-dev
am:
d499ae5a85
Change-Id: I3b2372a6de4107c5c37ef884ac7a9dede04d1c56
TreeHugger Robot [Fri, 25 Aug 2017 03:41:40 +0000 (03:41 +0000)]
Merge "Not hinting anymore when in power saver" into oc-mr1-dev
Selim Cinek [Fri, 25 Aug 2017 02:19:11 +0000 (02:19 +0000)]
Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev
am:
510cdad67b
Change-Id: I453002df3ec0a1af374dc8dbbb83f9683669e8be
TreeHugger Robot [Fri, 25 Aug 2017 02:07:15 +0000 (02:07 +0000)]
Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev
Jesse Hall [Fri, 25 Aug 2017 01:58:42 +0000 (01:58 +0000)]
Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev
am:
d1736cb2a7
Change-Id: Icaf237e5be3bbd0273a3119e86e995e478fa8576
TreeHugger Robot [Fri, 25 Aug 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev
Daniel Nishi [Thu, 24 Aug 2017 23:54:47 +0000 (23:54 +0000)]
Merge "Fix the user profile icon." into oc-mr1-dev
am:
6ebd3594ae
Change-Id: I156174893b4fa190767156d2fc17058dafc3f49e
jackqdyulei [Wed, 9 Aug 2017 16:57:05 +0000 (09:57 -0700)]
Add battery indicator to bluetooth icon
This cl creates BluetoothDeviceLayerDrawable, which contains two
drwable:
1. previous bluetooth device drawable
2. battery drawable showing the battery level
If connected bt device has battery level, we will use this
LayerDrawable both in bluetooth main page and detail page.
Also, battery drawable is reused from BatteryMeterDrawableBase, we
rotate base drawable by 90 degree and update the spec a little bit.
Bug:
63393322
Test: RunSettingsLibRoboTests
Change-Id: I55313940576523dcbeb65a6e20e41289da8a3e0c
Merged-In: I55313940576523dcbeb65a6e20e41289da8a3e0c
Fyodor Kupolov [Thu, 24 Aug 2017 23:46:59 +0000 (23:46 +0000)]
Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev
am:
f0b56a65f6
Change-Id: I00d9a4ab6f3ab7929c3f8b397329200b8983e672
Selim Cinek [Thu, 24 Aug 2017 23:35:29 +0000 (23:35 +0000)]
Merge "Fixed the progress bar positioning when expanded" into oc-mr1-dev
am:
4335a043bf
Change-Id: Ib1184aa7fe4f2fb9fc3c62b15d7bb8fce6a3d7e2
Daniel Nishi [Thu, 24 Aug 2017 23:29:35 +0000 (23:29 +0000)]
Merge "Fix the user profile icon." into oc-mr1-dev
Fyodor Kupolov [Thu, 24 Aug 2017 23:27:37 +0000 (23:27 +0000)]
Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev
Selim Cinek [Thu, 24 Aug 2017 23:22:53 +0000 (23:22 +0000)]
Merge "Fixed the progress bar positioning when expanded" into oc-mr1-dev
Tyler Gunn [Thu, 24 Aug 2017 23:20:14 +0000 (23:20 +0000)]
Merge "Track conference start in system elapsed time." am:
3b166fba8a am:
49042dc67c
am:
55967b462c
Change-Id: I5a7561dd09405bcdc38926bd331f5ffd8019ec2f
Tyler Gunn [Thu, 24 Aug 2017 23:08:07 +0000 (23:08 +0000)]
Merge "Track conference start in system elapsed time." am:
3b166fba8a
am:
49042dc67c
Change-Id: I90aa59e2889973dd1bd1d443b7bf5a11cbf46695
Tyler Gunn [Thu, 24 Aug 2017 22:58:02 +0000 (22:58 +0000)]
Merge "Track conference start in system elapsed time."
am:
3b166fba8a
Change-Id: I8b78aaa447adcc1bfce0fec8f50857daa37d0575
Rebecca Silberstein [Thu, 24 Aug 2017 22:47:29 +0000 (22:47 +0000)]
Merge "Add wifi permissions to shell" into oc-mr1-dev
am:
d3428e9a3b
Change-Id: I4aa82e6a8a9e9a11415e3020d6508a83cdfb453e
Brad Ebinger [Mon, 21 Aug 2017 21:58:52 +0000 (14:58 -0700)]
Remove PIN/PUK keyguard when SIM is removed/ready
1) If the PIN/PUK keyguard comes up for a locked
SIM, it can not be removed by removing the
affected SIM. It can only be removed by
rebooting the device or entering a bogus PIN.
This change automatically clears the keyguard
when when the locked SIM is removed. It will
be shown again if the locked SIM is re-entered.
2) If the device is PUK locked and the code
**05*PUK*new pin* new Pin# is entered in the
emergency dialer, it will unlock the SIM.
By listening to the READY state, we can remove
the keyguard when the SIM is unlocked by
other means.
Bug:
64469515
Bug:
64044132
Test: Manual
Change-Id: I9507f80edcd4c04dfa0cc3b48a25e619aafa9eb3
Android Build Merger (Role) [Thu, 24 Aug 2017 22:39:51 +0000 (22:39 +0000)]
Merge changes from topic "am-
2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "mtp-user" into oc-mr1-dev am:
4de4655f0d
Reset functions to null when user changes. am:
e537a83139
Jerry Zhang [Thu, 24 Aug 2017 22:33:13 +0000 (22:33 +0000)]
Merge changes from topic "mtp-user" into oc-mr1-dev
am:
4de4655f0d
Change-Id: I82355f09a7ec31870affc089887254472ae590be
Jerry Zhang [Thu, 24 Aug 2017 22:32:17 +0000 (22:32 +0000)]
Reset functions to null when user changes.
am:
e537a83139
Change-Id: Iea5d61d685c342e87cb96c8bbf3e863a81639c7b
Tyler Gunn [Thu, 24 Aug 2017 22:26:20 +0000 (22:26 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." am:
573948c49c am:
3da596d291
am:
50a25b99a4 -s ours
Change-Id: Ifb663f8e4b7016e7938495757e555c7695137c21
Rebecca Silberstein [Thu, 24 Aug 2017 22:25:34 +0000 (22:25 +0000)]
Merge "Add wifi permissions to shell" into oc-mr1-dev
OSDN Git Service
