OSDN Git Service
Dan Albert [Wed, 13 Dec 2017 20:07:04 +0000 (20:07 +0000)]
Merge "Include what we use." am:
b0efcc1f68
am:
afa15b0846
Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc
Dan Albert [Wed, 13 Dec 2017 19:52:11 +0000 (19:52 +0000)]
Merge "Include what we use."
am:
b0efcc1f68
Change-Id: Ic75bda75c80be19ee7f0f865ffd9e4f8c70fe785
Treehugger Robot [Wed, 13 Dec 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Include what we use."
Dmitry Shmidt [Wed, 13 Dec 2017 18:16:43 +0000 (18:16 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217
am:
c1ad3c5f29
Change-Id: I81a582d7ad20f062803963a3dc43ddcec288c8ec
Dmitry Shmidt [Wed, 13 Dec 2017 18:04:19 +0000 (18:04 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
am:
50666fa217
Change-Id: Ic97b3742278bcdb2b5ec7b0540a7f7252c5472a4
Dmitry Shmidt [Wed, 13 Dec 2017 17:51:47 +0000 (17:51 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
Rob Herring [Wed, 29 Nov 2017 15:26:31 +0000 (09:26 -0600)]
renderthread: relax error handling for wide gamut EGL configs
It is valid to advertise EGL_EXT_pixel_format_float, but not have a
the requested EGL config. Instead of aborting, fallback to the default
behavior.
Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
Cc: Romain Guy <romainguy@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Jack Yu [Wed, 13 Dec 2017 09:51:27 +0000 (09:51 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am:
125d736bbe
am:
06bf4f618c
Change-Id: I0fb9abd42aa9b995c76969a12b52eb6795acafb2
Jack Yu [Wed, 13 Dec 2017 09:42:49 +0000 (09:42 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
am:
125d736bbe
Change-Id: I9b2bd725ddaa40513747e368553c918899987d2f
Treehugger Robot [Wed, 13 Dec 2017 09:29:25 +0000 (09:29 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
Jack Yu [Thu, 7 Dec 2017 23:49:09 +0000 (15:49 -0800)]
Added test cases for DataCallResponse parcel read/write
bug:
64132030
Test: Unit tests
Merged-In: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
(cherry picked from commit
14c2aaa0a276807bdf922a3e7ce64bae880e0c68)
Eric Erfanian [Wed, 13 Dec 2017 02:21:36 +0000 (02:21 +0000)]
Merge "Add assisted dialing properties to the framework." am:
f5bec0d781
am:
1d9fc9a490
Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27
Hemant Gupta [Wed, 13 Dec 2017 01:56:18 +0000 (01:56 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am:
045d34ce76
am:
cbfae42c3c
Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61
Colin Cross [Wed, 13 Dec 2017 01:51:09 +0000 (01:51 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am:
9a3132d065
am:
4b7a6339cf
Change-Id: Ie2e2704b0de42b4eef032ad6bdca0f0e114bdd3e
Eric Erfanian [Wed, 13 Dec 2017 01:46:02 +0000 (01:46 +0000)]
Merge "Add assisted dialing properties to the framework."
am:
f5bec0d781
Change-Id: Ic4c118892b964e51136fb730070f2a6b6167b212
Colin Cross [Wed, 13 Dec 2017 01:43:52 +0000 (01:43 +0000)]
Merge "Remove unused target android.test.mock.sdk" am:
a4c0fa769a
am:
9d78e84a8e
Change-Id: Ie20f03c260883345171871196284f4dc2b6d06cd
Hemant Gupta [Wed, 13 Dec 2017 01:26:35 +0000 (01:26 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am:
045d34ce76
Change-Id: I21f59d9a7df98f37009e730acaf63938304e3af2
Colin Cross [Wed, 13 Dec 2017 01:20:42 +0000 (01:20 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
am:
9a3132d065
Change-Id: I6a71d49ae1cc7f3cd5b65c523e3e64b3a882e4da
Colin Cross [Wed, 13 Dec 2017 01:18:14 +0000 (01:18 +0000)]
Merge "Separate android.test.mock from test-runner source" am:
d330eeeeda
am:
78160c2577
Change-Id: Ibaad59f9c605f1c9ae02a4b63f7c01e6b508f55d
Colin Cross [Wed, 13 Dec 2017 01:11:46 +0000 (01:11 +0000)]
Merge "Remove unused target android.test.mock.sdk"
am:
a4c0fa769a
Change-Id: I4ff49776db15ff17449ac615cefd3d2c5e3d2465
Colin Cross [Wed, 13 Dec 2017 01:08:56 +0000 (01:08 +0000)]
Merge "Convert services to Android.bp" am:
5319777274
am:
b8500d4771
Change-Id: Idcfeb088fa73e679d18de2ce2dc2ba58cdc78af7
Colin Cross [Wed, 13 Dec 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Separate android.test.mock from test-runner source"
am:
d330eeeeda
Change-Id: I7d578d55332942f8e3cdc7b44dc10b31cafc4174
Jack He [Wed, 13 Dec 2017 00:45:58 +0000 (00:45 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string" am:
f7a69aeeab
am:
c57c5a9ba4
Change-Id: Id9b238bb2493455650351d595e4c7d2dd5005f2e
Treehugger Robot [Wed, 13 Dec 2017 00:38:42 +0000 (00:38 +0000)]
Merge "Add assisted dialing properties to the framework."
Colin Cross [Wed, 13 Dec 2017 00:38:41 +0000 (00:38 +0000)]
Merge "Convert services to Android.bp"
am:
5319777274
Change-Id: I41a44a2684fa322039d3979a663aa4b4e0ef73d7
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
Dan Albert [Wed, 13 Dec 2017 00:08:11 +0000 (16:08 -0800)]
Include what we use.
Test: mma
Bug: None
Change-Id: I9458aedad9a84f1660d3a2b08717b111dc8e3b74
Exempt-From-Owner-Approval: trivial cleanup
Jack He [Wed, 13 Dec 2017 00:02:25 +0000 (00:02 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
am:
f7a69aeeab
Change-Id: I6be2177bcc81cd16824fc20b2dbf7a8a6c9464b8
Adam Lesinski [Tue, 12 Dec 2017 23:36:57 +0000 (23:36 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
am:
a06854e77a
Change-Id: I9d4f214b3911fb66fd2baa8ad83e8450246c3c80
Colin Cross [Tue, 12 Dec 2017 23:27:15 +0000 (23:27 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
Colin Cross [Tue, 12 Dec 2017 23:26:41 +0000 (23:26 +0000)]
Merge "Remove unused target android.test.mock.sdk"
Colin Cross [Tue, 12 Dec 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Separate android.test.mock from test-runner source"
Colin Cross [Tue, 12 Dec 2017 23:25:09 +0000 (23:25 +0000)]
Merge "Convert services to Android.bp"
Colin Cross [Thu, 7 Dec 2017 21:11:06 +0000 (13:11 -0800)]
Convert legacy-test, test-runner, and test-mock to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
Merged-In: I110f752d2fa94c44581f20d4f308d9d429da0517
(cherry-picked from commit
2b7d71c7f8028741c2200bfeba8913b7f4f55cde)
Paul Duffin [Thu, 16 Nov 2017 13:02:37 +0000 (13:02 +0000)]
Remove unused target android.test.mock.sdk
Bug:
30188076
Test: make checkbuild
Change-Id: I9b613969425e6c4d8700f6275484d6452a3cc3af
Merged-In: I9b613969425e6c4d8700f6275484d6452a3cc3af
(cherry picked from commit
10d0658bf020197c16264a1da4637e0d20ee6445)
Paul Duffin [Wed, 15 Nov 2017 11:39:14 +0000 (11:39 +0000)]
Separate android.test.mock from test-runner source
Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.
Bug:
30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit
e254526f0fe5d22681555bd4a00b7ee96fee1dc1)
Colin Cross [Tue, 5 Dec 2017 17:46:29 +0000 (09:46 -0800)]
Convert services to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
Merged-In: I417409281c928ea667d937090d2a0d9d72a449a2
Exempt-From-Owner-Approval: trivial conversion
(cherry-picked from commit
e0b2ee52d2f274a2d46b2e6695e42d2764c39fa7)
Treehugger Robot [Tue, 12 Dec 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
TreeHugger Robot [Tue, 12 Dec 2017 21:48:11 +0000 (21:48 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
Hansong Zhang [Tue, 12 Dec 2017 19:22:12 +0000 (19:22 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am:
5b6b73800c
am:
64d81fbf33
Change-Id: I1be05324ec0134c801de08e0f60139c341261f33
Hansong Zhang [Tue, 12 Dec 2017 19:11:56 +0000 (19:11 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
am:
5b6b73800c
Change-Id: I29c61bf210b8bb01c3a51a12dca4e8a6d3e0d9e1
Treehugger Robot [Tue, 12 Dec 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Jack Yu [Tue, 12 Dec 2017 18:29:04 +0000 (18:29 +0000)]
Merge "Moved data connection response into system api." am:
8ded1cde4a
am:
88aa63a6a2
Change-Id: Iac46d7f4c0d6c8d46df77c6349b325b5dd5831b3
Jack Yu [Tue, 12 Dec 2017 18:18:09 +0000 (18:18 +0000)]
Merge "Moved data connection response into system api."
am:
8ded1cde4a
Change-Id: Ibcd8c9c11459e39ea8ba32f9bb680716c1ac9b0d
Treehugger Robot [Tue, 12 Dec 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Moved data connection response into system api."
Eric Erfanian [Thu, 7 Dec 2017 00:27:53 +0000 (16:27 -0800)]
Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.
Test: no existing unit tests found. could use some pointers
Bug:
35963245
Change-Id: I3ed8ac5ad7300c44f87e2573d9409b3a92b98ab6
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
Todd Kennedy [Tue, 12 Dec 2017 15:14:20 +0000 (15:14 +0000)]
Merge "Block the upgrade of persistent apps" am:
0b30d95dc8
am:
6de91158d7
Change-Id: I729df40376b972461908d22593b63f4f5399e356
Todd Kennedy [Tue, 12 Dec 2017 15:05:24 +0000 (15:05 +0000)]
Merge "Block the upgrade of persistent apps"
am:
0b30d95dc8
Change-Id: Icd375c367293169b2d2f7661fcb337cafd324714
Todd Kennedy [Tue, 12 Dec 2017 14:55:01 +0000 (14:55 +0000)]
Merge "Block the upgrade of persistent apps"
Paul Duffin [Tue, 12 Dec 2017 13:19:26 +0000 (13:19 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am:
60f0b06d19
am:
6ff2ad3044
Change-Id: I7ec4ac17b4fead69b3ffbd754cd3ce33978c64cb
Paul Duffin [Tue, 12 Dec 2017 13:09:48 +0000 (13:09 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
am:
60f0b06d19
Change-Id: I530df72ef5dc2c50a2304e5b2fe1ddff2ade2eeb
Treehugger Robot [Tue, 12 Dec 2017 12:55:28 +0000 (12:55 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
Siyamed Sinir [Tue, 12 Dec 2017 04:25:54 +0000 (04:25 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout" am:
b7941c50a0
am:
0863cf4e40
Change-Id: Ief495fcc7e6f711696ed6337ab65face9d03c981
Siyamed Sinir [Tue, 12 Dec 2017 04:15:03 +0000 (04:15 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
am:
b7941c50a0
Change-Id: I67578129771d0c7d52d5da63f24c2f0d6081ab57
Siyamed Sinir [Tue, 12 Dec 2017 03:57:43 +0000 (03:57 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
Hall Liu [Tue, 12 Dec 2017 02:11:04 +0000 (02:11 +0000)]
Merge "Add CarrierConfig key for RTT support" am:
e5a913661d
am:
79dc6fb815
Change-Id: I11ef3f96e578e077288fe60725d326a20f45daf1
Hall Liu [Tue, 12 Dec 2017 01:59:47 +0000 (01:59 +0000)]
Merge "Add CarrierConfig key for RTT support"
am:
e5a913661d
Change-Id: I035f9ae243dfe1a8c3bc1300851e88fdcb73dafd
Hall Liu [Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)]
Merge "Add CarrierConfig key for RTT support"
Amit Mahajan [Tue, 12 Dec 2017 01:37:32 +0000 (01:37 +0000)]
Merge "Revert "Add support for send Message with messaging options"" am:
563d93c107
am:
b1ba135258
Change-Id: I874df0b3061ef2f22de6d1c5f9338aa395092ee8
Tyler Gunn [Tue, 12 Dec 2017 01:27:00 +0000 (01:27 +0000)]
Merge "Add carrier config to always play hold tone when remotely held." am:
c352f5f861
am:
c9187f9199
Change-Id: Ic5b3a6089b03771bb0c0e48e0e8e01cbca839b47
Amit Mahajan [Tue, 12 Dec 2017 01:26:00 +0000 (01:26 +0000)]
Merge "Revert "Add support for send Message with messaging options""
am:
563d93c107
Change-Id: I5db31fdbddfdceb5417f617d7856f8a2a85cedb4
Tyler Gunn [Tue, 12 Dec 2017 01:16:30 +0000 (01:16 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
am:
c352f5f861
Change-Id: I16a53c2ec034c32c9e771e367c18ab20c1a52cf4
Amit Mahajan [Tue, 12 Dec 2017 01:04:54 +0000 (01:04 +0000)]
Merge "Revert "Add support for send Message with messaging options""
Treehugger Robot [Tue, 12 Dec 2017 00:56:37 +0000 (00:56 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:58:48 +0000 (23:58 +0000)]
Merge "Carrier confirmation code." am:
6627d2c4df
am:
0e788e00b6
Change-Id: Ibbb439b724ee031b76ff42ecd84c3c1f2df69ae1
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Carrier confirmation code."
am:
6627d2c4df
Change-Id: I444b27d11472cd9a84e4df3b5ae624fba0b13e71
Amit Mahajan [Mon, 11 Dec 2017 23:30:35 +0000 (23:30 +0000)]
Revert "Add support for send Message with messaging options"
This reverts commit
bbef627077c5126b5b1292a5a396d784218c09cf.
Reason for revert: Causing long sms failure
Bug:
68762942
Change-Id: I43c36e3286105459c7e08d1a0b2d89b4c42140b2
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:29:34 +0000 (23:29 +0000)]
Merge "Carrier confirmation code."
Hall Liu [Tue, 21 Nov 2017 00:25:39 +0000 (16:25 -0800)]
Add CarrierConfig key for RTT support
Add the carrier config key.
Test: add fake support for some random carrier, look for the capability
Bug:
63934808
Change-Id: I8a0e33a7ac10fbdcad356059913e7ddcba26bb6c
Hansong Zhang [Sat, 9 Dec 2017 00:05:55 +0000 (16:05 -0800)]
Make BluetoothPbap implement BluetoothProfile (1/3)
* BluetoothPbap will implement BluetoothProfile to be consistent with
other profiles
* Changed the method names to match the BluetoothProfile method
signatures
* Removed doesClassMatchSink() as it is never used
* Disable default DEBUG logs
Test: test with carkits
Bug:
69417672
Change-Id: I0766188f77468808d7505780c781f5fd8608af60
Jack He [Mon, 11 Dec 2017 21:11:20 +0000 (13:11 -0800)]
Bluetooth: Add convenience method to convert connection state to string
* Add method to convert the following state values to string
- BluetoothHeadset.STATE_DISCONNECTED
- BluetoothHeadset.STATE_CONNECTING
- BluetoothHeadset.STATE_CONNECTED
- BluetoothHeadset.STATE_DISCONNECTING
Test: make
Change-Id: Iaa5b6e35d3214ded8edbe29d626e0869651417d1
Paul Duffin [Mon, 11 Dec 2017 20:19:56 +0000 (20:19 +0000)]
Remove LOCAL_STATIC_SHARED_LIBRARY usage
That property is not used during the build so its usage can be safely
removed because it has no effect.
Bug:
30188076
Test: make checkbuild
Change-Id: Ie337426733c26ec12b344b8f4b7467aa7f9f63f3
susanta.patra [Mon, 11 Dec 2017 19:41:40 +0000 (19:41 +0000)]
Merge "Fixed button bar alignment issue in RTL languages" am:
403c8f72e3
am:
2063b1f792
Change-Id: I7493a720ef88f0b40ebed483d474a34ad9ee5da4
susanta.patra [Mon, 11 Dec 2017 19:28:44 +0000 (19:28 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
am:
403c8f72e3
Change-Id: I8a14f71b20fd07ac3fd9025ba4e303a11709fe0a
Treehugger Robot [Mon, 11 Dec 2017 19:10:46 +0000 (19:10 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
luozhanwei [Mon, 11 Dec 2017 16:14:17 +0000 (16:14 +0000)]
Merge "[DeadLock]AMS PMS MountService" am:
998ac99db4
am:
41fb54b955
Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa
luozhanwei [Mon, 11 Dec 2017 16:05:19 +0000 (16:05 +0000)]
Merge "[DeadLock]AMS PMS MountService"
am:
998ac99db4
Change-Id: I5910f42d91c3c3edcc092a87cc2e291d6e83e75e
Treehugger Robot [Mon, 11 Dec 2017 15:47:45 +0000 (15:47 +0000)]
Merge "[DeadLock]AMS PMS MountService"
Hugo Benichi [Mon, 11 Dec 2017 00:24:33 +0000 (00:24 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times" am:
c0d951c3e0
am:
144d9e9f83
Change-Id: Iad5a7cda8b73f638aa7db8ae38bdccef1cbeae85
Hugo Benichi [Mon, 11 Dec 2017 00:12:16 +0000 (00:12 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
am:
c0d951c3e0
Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97
Hugo Benichi [Sun, 10 Dec 2017 23:54:13 +0000 (23:54 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
Nicolas Geoffray [Sat, 9 Dec 2017 13:56:54 +0000 (13:56 +0000)]
Merge "Revert "Remove empty ScopedArray constructor."" am:
f6a0a7491b
am:
73fce7397e
Change-Id: I8bb88e7b91928ae8fc79233a74fe545aa3d40bb7
Nicolas Geoffray [Sat, 9 Dec 2017 13:38:43 +0000 (13:38 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
am:
f6a0a7491b
Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
Nicolas Geoffray [Sat, 9 Dec 2017 13:26:00 +0000 (13:26 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
Nicolas Geoffray [Sat, 9 Dec 2017 13:25:26 +0000 (13:25 +0000)]
Revert "Remove empty ScopedArray constructor."
Libcore tests still fail.
This reverts commit
cee368b2b8299db5808284a30e2aa14d0aff8b4a.
Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164
Hugo Benichi [Wed, 6 Dec 2017 04:28:09 +0000 (13:28 +0900)]
DefaultNetworkEvent: fix two bugs with validation times
This patch fixes two bugs around the validation time calculation for
default network metrics:
- for events representing the absence of a default network, the
validation time was not correctly set to 0.
- for events representing a default network, the validation time was
always set to the duration time. This was overlooked by commit
380a0638588d.
Also fix a minor printing padding issue in DefaultNetworkEvent#toString
Test: manually inspected the output of $ adb shell dumpsys connmetrics
while enabling and disabling wifi.
Change-Id: I0eb4ccdf7a61d3097d0661104cb40d738e59772a
Siyuan Zhou [Sat, 9 Dec 2017 03:18:08 +0000 (03:18 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am:
5323d42b82
am:
c044749416
Change-Id: If096fea07e31abbd8c5c418c776296c1200009d9
Siyuan Zhou [Sat, 9 Dec 2017 03:06:26 +0000 (03:06 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
am:
5323d42b82
Change-Id: Iaf53e8a99b61d68c3b920b76c78e9208845c56f3
Treehugger Robot [Sat, 9 Dec 2017 02:55:20 +0000 (02:55 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
Roshan Pius [Sat, 9 Dec 2017 01:58:08 +0000 (01:58 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am:
e339662247
am:
66c8516600
Change-Id: I9c7175d9e2db45780f14630db43a6ab5672dfe3d
Roshan Pius [Sat, 9 Dec 2017 01:48:34 +0000 (01:48 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am:
e339662247
Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
Treehugger Robot [Sat, 9 Dec 2017 01:34:07 +0000 (01:34 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
Holly Jiuyu Sun [Sat, 14 Oct 2017 02:06:34 +0000 (19:06 -0700)]
Carrier confirmation code.
If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.
Add the confirmationCode as a member in DownloadableSubscription.
Merged-In: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Test: unit test, e2e on phone
Bug:
36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Etan Cohen [Sat, 9 Dec 2017 00:26:47 +0000 (00:26 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" am:
8d621cc042
am:
bd82991016 -s ours
Change-Id: I0d878f4ae7067e875879e683525d20338f2e3405
Etan Cohen [Sat, 9 Dec 2017 00:14:11 +0000 (00:14 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"
am:
8d621cc042
Change-Id: I31a1ebcecd49b620462f2fb917e6c0c0d8f4d06e
Etan Cohen [Fri, 8 Dec 2017 23:58:36 +0000 (23:58 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"
Siyuan Zhou [Mon, 4 Dec 2017 21:02:11 +0000 (13:02 -0800)]
BootReceiver: Added an event log after the dropbox file copy is successful.
The log can be used to test if LAST KMSG or other items are copied
to dropbox successfully, especially in user builds without root
privilege.
BUG:
69685635
Test: manually verified the desired log from bugreport on user
and userdebug builds.
Change-Id: I6570d95538d678c98d261690ca3c20416d7a31c6
Merged-In: Ie6033bf04c7f79fc596761ab751aa5fcea2c1130
(cherry-picked from commit
bafcd7b59519ce67738c870cf9b69a7c0583cc9b)
Jack He [Fri, 8 Dec 2017 22:41:35 +0000 (22:41 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable" am:
1801711c53
am:
b9d49781ac
Change-Id: I8173afb73788a3de9ce7b1af07e653f9b76fbefa
Jack He [Fri, 8 Dec 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
am:
1801711c53
Change-Id: I58d0f361db35998b30c70cfd380e35b63e543524
Roshan Pius [Fri, 8 Dec 2017 22:29:50 +0000 (22:29 +0000)]
Revert "Send empty LinkProperties when entering StoppedState."
This reverts commit
b3f9f4a30502477e71fc93037dc58080fddb1853.
Reason for revert: Crash in WifiStateMachine (b/
70394432)
Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8