OSDN Git Service
TreeHugger Robot [Fri, 26 May 2017 09:51:36 +0000 (09:51 +0000)]
Merge "Backup / restore additional lock screen settings"
TreeHugger Robot [Fri, 26 May 2017 07:26:44 +0000 (07:26 +0000)]
Merge "MathUtils.map fix"
Sundeep Ghuman [Fri, 26 May 2017 03:01:42 +0000 (03:01 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev am:
04b5a63006
am:
3bb97f1b9b
Change-Id: I5bbd8026696ebaf6dcd24d19a8544d83734e001a
Sundeep Ghuman [Fri, 26 May 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev
am:
04b5a63006
Change-Id: I3827885f89229f3063dd96ecaab9400e4579350b
TreeHugger Robot [Fri, 26 May 2017 02:47:51 +0000 (02:47 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev
Dianne Hackborn [Fri, 26 May 2017 01:50:19 +0000 (01:50 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev am:
e2975af2d3
am:
97dc2db3da
Change-Id: I9ff271cbd12303e5ffad3797886db14b20cc750f
Makoto Onuki [Fri, 26 May 2017 01:48:27 +0000 (01:48 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev am:
58f6f428fc
am:
a629afb05e
Change-Id: Icaa2e4c459a68dd6d667c81a5762554391cd233f
Ian Lake [Fri, 26 May 2017 01:43:09 +0000 (01:43 +0000)]
Merge "Relayout when base inner insets change" into oc-dev am:
7f874db5aa
am:
82624f130b
Change-Id: I1bb3642d57f7cbce3813ebb6ae131cad544fb674
Adam Powell [Fri, 26 May 2017 01:41:16 +0000 (01:41 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev am:
05d64e8b72
am:
f7a9adec31
Change-Id: I81eef839315a64d5a4c9cee84289f14493abd988
Dianne Hackborn [Fri, 26 May 2017 01:39:51 +0000 (01:39 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev
am:
e2975af2d3
Change-Id: I431753261cfab677935a65548d235585c19ed565
Makoto Onuki [Fri, 26 May 2017 01:37:50 +0000 (01:37 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
am:
58f6f428fc
Change-Id: I108e9cc771457bb537d2857cde8f96607dbb0a8f
Suprabh Shukla [Fri, 26 May 2017 01:31:25 +0000 (01:31 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev am:
db6caa5841
am:
ee6f729f53
Change-Id: Ibe0cdf35cc21d7e6a0f20925ebcc2ce336f943f3
Ian Lake [Fri, 26 May 2017 01:31:10 +0000 (01:31 +0000)]
Merge "Relayout when base inner insets change" into oc-dev
am:
7f874db5aa
Change-Id: I91bc90559f462d622133a018b1217eae10b6e11b
Adam Powell [Fri, 26 May 2017 01:28:41 +0000 (01:28 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
am:
05d64e8b72
Change-Id: I3cbf8fbdc9a54f1d47c1ab4c86eaf3f1850f468f
Jeff Sharkey [Fri, 26 May 2017 01:22:43 +0000 (01:22 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev am:
a6b7e0a679
am:
02315ed73d
Change-Id: If5391cac47775031d05bab87b0effa8e2742230a
Suprabh Shukla [Fri, 26 May 2017 01:17:50 +0000 (01:17 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev
am:
db6caa5841
Change-Id: I00ea2d375c9543f26d0489939183b612942b1b46
Bryce Lee [Fri, 26 May 2017 01:15:54 +0000 (01:15 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev am:
aa051df3b6
am:
e07ceaf979
Change-Id: I574c0c30847f541c136ab377a9ea87e3d51577fb
TreeHugger Robot [Fri, 26 May 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev
Lorenzo Colitti [Fri, 26 May 2017 01:10:24 +0000 (01:10 +0000)]
Merge changes from topic 'am-
d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
am:
5fcfca0cba -s ours
Change-Id: Ia18a65bca3874b030ff4d5f97e11865a1f42f18a
Jeff Sharkey [Fri, 26 May 2017 01:09:53 +0000 (01:09 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev
am:
a6b7e0a679
Change-Id: I1610373c91aa4fc2a60732c51145b585b6372729
Bryce Lee [Fri, 26 May 2017 01:05:20 +0000 (01:05 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev
am:
aa051df3b6
Change-Id: I4a8e9eb6452a40acdb0e9fc3a6a6db4908062b8b
Hugo Benichi [Fri, 26 May 2017 01:04:44 +0000 (01:04 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b am:
41a57af66a am:
ae278410f5
am:
6923028613
Change-Id: Id592d287a92c89320a682d660792b9b6c67e7563
Android Build Merger (Role) [Fri, 26 May 2017 01:02:21 +0000 (01:02 +0000)]
Merge changes from topic 'am-
d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'multinetwork_vndk' into oc-dev am:
cffee96a16
Move libandroid_net from Android.mk to Android.bp. am:
addb296226 -s ours
Lorenzo Colitti [Fri, 26 May 2017 01:01:21 +0000 (01:01 +0000)]
Merge changes from topic 'multinetwork_vndk' into oc-dev
am:
cffee96a16
Change-Id: I91cac262cdb6af6e441c4750636ec28a97f2ad1a
Lorenzo Colitti [Fri, 26 May 2017 00:59:52 +0000 (00:59 +0000)]
Move libandroid_net from Android.mk to Android.bp.
am:
addb296226 -s ours
Change-Id: Ie5c94188dfe3ea99a0ef3747c8b359c32e6176f0
Hugo Benichi [Fri, 26 May 2017 00:58:27 +0000 (00:58 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b am:
41a57af66a
am:
ae278410f5
Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
Hugo Benichi [Fri, 26 May 2017 00:51:23 +0000 (00:51 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b
am:
41a57af66a
Change-Id: Ieea1398319d8235e823464239d233bf6f528126d
TreeHugger Robot [Fri, 26 May 2017 00:45:38 +0000 (00:45 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
Sundeep Ghuman [Thu, 11 May 2017 00:45:13 +0000 (17:45 -0700)]
Add extra debug logging to WifiTracker.
Bug: b/
38212080
Test: NA
Change-Id: I1f5d1a1d43a1dd4d9ce2235d3a53d043d4e2120d
Hugo Benichi [Fri, 26 May 2017 00:43:06 +0000 (00:43 +0000)]
Merge changes If4deb106,Ib25d7658
am:
0388f0e47b
Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
Hugo Benichi [Fri, 26 May 2017 00:34:03 +0000 (00:34 +0000)]
Merge changes If4deb106,Ib25d7658
* changes:
NsdService: do not use ContentResolver directly
@Ignore ConnectivityServiceTest#testRequestBenchmark
Android Build Merger (Role) [Thu, 25 May 2017 23:53:05 +0000 (23:53 +0000)]
Merge "Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp am:
fa5f8fa8a8"
Hyunyoung Song [Thu, 25 May 2017 23:52:25 +0000 (23:52 +0000)]
Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp
am:
fa5f8fa8a8
Change-Id: I11d97f6c553882c0fb2423c1a62ee540378fcd25
Android Build Merger (Role) [Thu, 25 May 2017 23:51:43 +0000 (23:51 +0000)]
Merge "Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840 am:
689edc736f" into oc-dev-plus-aosp am:
f5fb04573b"
Brad Ebinger [Thu, 25 May 2017 23:50:59 +0000 (23:50 +0000)]
Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840 am:
689edc736f" into oc-dev-plus-aosp
am:
f5fb04573b
Change-Id: I3447422054e0f563e9314686c1638c43e7df296e
Android Build Merger (Role) [Thu, 25 May 2017 23:50:28 +0000 (23:50 +0000)]
Merge "Merge "Force a light to be set for the first time" into oc-dev am:
9ddb0f8691 -s ours am:
bf7443156d -s ours"
Oleksiy Avramchenko [Thu, 25 May 2017 23:49:46 +0000 (23:49 +0000)]
Merge "Force a light to be set for the first time" into oc-dev am:
9ddb0f8691 -s ours
am:
bf7443156d -s ours
Change-Id: I770eabd9e59158a984581d1e9ae14b9bf02adfd5
Android Build Merger (Role) [Thu, 25 May 2017 23:49:16 +0000 (23:49 +0000)]
Merge "Merge "Fixed memory leak with the inflater" into oc-dev am:
3d5fd7a959 am:
9cd34aa978"
Anthony Chen [Thu, 25 May 2017 23:48:40 +0000 (23:48 +0000)]
Merge "Allow notification actions to be configured."
Selim Cinek [Thu, 25 May 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Fixed memory leak with the inflater" into oc-dev am:
3d5fd7a959
am:
9cd34aa978
Change-Id: I8466a554dbe03eb83f8f737ff76b159dde0fc532
Chet Haase [Thu, 25 May 2017 23:43:20 +0000 (23:43 +0000)]
Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev am:
68311f8712
am:
4b35637a4a
Change-Id: If37d42fffcd17cec5e00f92c8a24215cc5425751
Selim Cinek [Thu, 25 May 2017 23:40:28 +0000 (23:40 +0000)]
Merge "Fixed an issue when inflating too many notifications" into oc-dev am:
3a6f2a30ce
am:
d68026a77f
Change-Id: I6200bed8201730d2c26e4882277e3632558c403d
Chad Brubaker [Thu, 25 May 2017 23:36:50 +0000 (23:36 +0000)]
Merge "Handle install time ephemeral permissions" into oc-dev am:
dc89202d1a
am:
32b9061d2c
Change-Id: Ie6072d3704e9bdecbc4b55c93e3aca129c31e620
Jason Monk [Thu, 25 May 2017 23:34:27 +0000 (23:34 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev am:
34b64f2559
am:
dd7ab998fd -s ours
Change-Id: I9b4bea605ac491e9d8d577cc1fdf17a8957c9a8d
TreeHugger Robot [Thu, 25 May 2017 23:25:43 +0000 (23:25 +0000)]
Merge "Relayout when base inner insets change" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:19:51 +0000 (23:19 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev
Android Build Merger (Role) [Thu, 25 May 2017 23:13:04 +0000 (23:13 +0000)]
Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp
Hyunyoung Song [Thu, 25 May 2017 23:12:19 +0000 (23:12 +0000)]
Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev
am:
cca181bfbb
Change-Id: Ie70026a3aec8155368d867b7b736634cf6492f44
Android Build Merger (Role) [Thu, 25 May 2017 23:12:05 +0000 (23:12 +0000)]
Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840 am:
689edc736f" into oc-dev-plus-aosp
Oleksiy Avramchenko [Thu, 25 May 2017 23:10:24 +0000 (23:10 +0000)]
Merge "Force a light to be set for the first time" into oc-dev
am:
9ddb0f8691 -s ours
Change-Id: I45be47b28daa351915890459cbf9046a28d65812
Brad Ebinger [Thu, 25 May 2017 23:10:21 +0000 (23:10 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840
am:
689edc736f
Change-Id: Ifd9fc089d7165506f6953e810c040de868f5bafe
Selim Cinek [Thu, 25 May 2017 23:08:11 +0000 (23:08 +0000)]
Merge "Fixed memory leak with the inflater" into oc-dev
am:
3d5fd7a959
Change-Id: I90d93918d1b188d09f6d2cf3ed70ceed38b07086
Jeff Sharkey [Thu, 25 May 2017 23:07:04 +0000 (23:07 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev
Chet Haase [Thu, 25 May 2017 23:05:43 +0000 (23:05 +0000)]
Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev
am:
68311f8712
Change-Id: I5c5a18d57e5658262793f0bd67f8a9febda055cd
TreeHugger Robot [Thu, 25 May 2017 23:03:49 +0000 (23:03 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev
Lorenzo Colitti [Thu, 25 May 2017 23:02:36 +0000 (23:02 +0000)]
Merge changes from topic 'multinetwork_vndk' into oc-dev
* changes:
Allow vendor code to link to libandroid_net.
Move libandroid_net from Android.mk to Android.bp.
Brad Ebinger [Thu, 25 May 2017 23:00:29 +0000 (23:00 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c
am:
be34238840
Change-Id: Ie399093e992c7b15c72927080b5c20d378738785
TreeHugger Robot [Thu, 25 May 2017 22:55:51 +0000 (22:55 +0000)]
Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:54:59 +0000 (22:54 +0000)]
Merge "Force a light to be set for the first time" into oc-dev
Selim Cinek [Thu, 25 May 2017 22:54:08 +0000 (22:54 +0000)]
Merge "Fixed memory leak with the inflater" into oc-dev
Selim Cinek [Thu, 25 May 2017 22:53:54 +0000 (22:53 +0000)]
Merge "Fixed an issue when inflating too many notifications" into oc-dev
am:
3a6f2a30ce
Change-Id: Ic2a82150d08eb70762c08822b040860e79f66b0b
TreeHugger Robot [Thu, 25 May 2017 22:51:14 +0000 (22:51 +0000)]
Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev
Brad Ebinger [Thu, 25 May 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
am:
25ce41cf4c
Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb
Selim Cinek [Thu, 25 May 2017 22:42:11 +0000 (22:42 +0000)]
Merge "Fixed an issue when inflating too many notifications" into oc-dev
Julia Reynolds [Thu, 25 May 2017 22:40:49 +0000 (22:40 +0000)]
Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev am:
e6bf4f808d
am:
e90447d155
Change-Id: Icfd11d69ae943e6a96c229fbb3d7ebcf47dd2f92
Dianne Hackborn [Thu, 25 May 2017 22:33:53 +0000 (15:33 -0700)]
Fix issue #
62103358: ProcessRecord dump formatting problem
Give hasTopUi and hasOverlayUi a newline, also combine them together,
and move them up to be with the rest of the process importance
data (not at the very end after all the list of connections and
other things).
Test: manual
Change-Id: I1a391c03b58e0e5e6f7ce595376f590ce9e7e5bc
Chad Brubaker [Thu, 25 May 2017 22:36:15 +0000 (22:36 +0000)]
Merge "Handle install time ephemeral permissions" into oc-dev
am:
dc89202d1a
Change-Id: I4da687bd1f5008788e54cc03309a01b060d1829e
Makoto Onuki [Wed, 24 May 2017 19:25:46 +0000 (12:25 -0700)]
SelectionActionModeHelper should use target view's thread
Use the looper from the TextView's thread for the helper
Bug
62043115
Test: Manual, type on edit field and select text
Change-Id: I501430a500016a81963a9f9fa636474b708b9b36
Brad Ebinger [Thu, 25 May 2017 22:31:51 +0000 (22:31 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
Jason Monk [Thu, 25 May 2017 22:30:40 +0000 (22:30 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev
am:
34b64f2559
Change-Id: I412152b803be5a4e70b018c38ec3bbda76a51a01
TreeHugger Robot [Thu, 25 May 2017 22:28:24 +0000 (22:28 +0000)]
Merge "Handle install time ephemeral permissions" into oc-dev
Julia Reynolds [Thu, 25 May 2017 22:28:32 +0000 (22:28 +0000)]
Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev
am:
e6bf4f808d
Change-Id: Ie81e000348bd6a4e247c40681202965285f2584c
TreeHugger Robot [Thu, 25 May 2017 22:21:23 +0000 (22:21 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev
Hugo Benichi [Thu, 25 May 2017 04:49:32 +0000 (13:49 +0900)]
NsdService: do not use ContentResolver directly
This patch changes NsdService to call registerContentObserver in the
ContentResolver class indirectly through NsdSettings.
This allows to easily intercept it and mock it in unit tests, and solves
test failures on the internal master branch where
registerContentObserver uses final or static methods that cannot be
worked around.
Bug:
32561414
Bug:
62044295
Test: runtest -x frameworks/base/tests/net/../NsdServiceTest.java
Change-Id: If4deb106de551746babb70196b20f21ece478850
Hugo Benichi [Thu, 25 May 2017 04:42:31 +0000 (13:42 +0900)]
@Ignore ConnectivityServiceTest#testRequestBenchmark
Ignore the last remaining test in ConnectivityServiceTest with spurious
failures. testRequestBenchmark has some intrinsic chances of failure due
to the fact it attempts to assert elapsed time durations against a
reference target.
Bug:
32561414
Test: no functional change
Change-Id: Ib25d76581b47997b2ef84df3e6a9fd9224b85d92
Jaekyun Seok [Thu, 25 May 2017 22:17:44 +0000 (22:17 +0000)]
Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev am:
a941e29c55
am:
a3bf175d8a
Change-Id: Id12f519492f588c53206f6ee035e0ee9943eca72
TreeHugger Robot [Thu, 25 May 2017 22:14:57 +0000 (22:14 +0000)]
Merge "Don't dismiss keyguard if guest has Pin/Pattern/PW set"
TreeHugger Robot [Thu, 25 May 2017 22:14:31 +0000 (22:14 +0000)]
Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev
Jaekyun Seok [Thu, 25 May 2017 22:05:51 +0000 (22:05 +0000)]
Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev
am:
a941e29c55
Change-Id: I47bf589cf849a81a310d0890156bf7c937dd354a
Jason Monk [Thu, 25 May 2017 22:00:15 +0000 (22:00 +0000)]
Merge "Fix up the QS gutter" into oc-dev am:
78ee090f78
am:
f4968f3c98
Change-Id: I9b7d99aa2b519c8c9629dbec32d22c906f0456f7
Adrian Roos [Thu, 25 May 2017 21:58:04 +0000 (21:58 +0000)]
Merge "AOD: Fix camera icon visibility" into oc-dev am:
f3a50f1675
am:
9404678b89
Change-Id: I741b93c818389d30a8795997898b5550c37bb02a
Jason Monk [Thu, 25 May 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Fix up the QS gutter" into oc-dev
am:
78ee090f78
Change-Id: I84250204436869ad18365acc42688fd6455f94a4
TreeHugger Robot [Thu, 25 May 2017 21:50:52 +0000 (21:50 +0000)]
Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev
Adrian Roos [Thu, 25 May 2017 21:48:37 +0000 (21:48 +0000)]
Merge "AOD: Fix camera icon visibility" into oc-dev
am:
f3a50f1675
Change-Id: I012732902d2f076e247f69f297bc4613ad4d0e94
TreeHugger Robot [Thu, 25 May 2017 21:41:47 +0000 (21:41 +0000)]
Merge "Fix up the QS gutter" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 21:40:50 +0000 (21:40 +0000)]
Merge "AOD: Fix camera icon visibility" into oc-dev
Bryce Lee [Thu, 25 May 2017 21:08:26 +0000 (21:08 +0000)]
Merge "Use cached keyguard flags during relaunch." into oc-dev am:
9eb635c428
am:
15cb2a966c
Change-Id: I182715d3c0222d1f7ef140b0062692f515b36100
Bryce Lee [Thu, 25 May 2017 21:06:14 +0000 (21:06 +0000)]
Merge "Do not remove task until all activities have been destroyed." into oc-dev am:
f18c5862e8
am:
6704d6e810
Change-Id: Ic719fbd29a0bf43c6180bd3fa5d5bb822ae10a9a
Lorenzo Colitti [Wed, 17 May 2017 07:50:17 +0000 (16:50 +0900)]
Allow vendor code to link to libandroid_net.
This library contains only the multinetwork API, which is part
of the NDK and has long-term support. It is needed by any native
that wants to use network communications on a different network
than the default network, and thus is necessary for vendor code
such as IMS clients or carrier applications.
Bug:
37527489
Test: marlin builds and boots
Test: MultinetworkApiTest CTS tests passes
Change-Id: I2aa592d1d082aae410173adf2a09f6d1dd8092dc
Merged-In: I2aa592d1d082aae410173adf2a09f6d1dd8092dc
Alexey Polyudov [Thu, 25 May 2017 21:00:18 +0000 (21:00 +0000)]
Merge "sensors: pass sensor handle along with injected event"
Lorenzo Colitti [Wed, 17 May 2017 07:46:02 +0000 (16:46 +0900)]
Move libandroid_net from Android.mk to Android.bp.
This is the first step of making libandroid_net available to
vendor code. This is a partial cherry-pick of ag/
2210044 that
only moves the build target (hence the Merged-In change ID).
Bug:
37527489
Test: marlin builds and boots
Change-Id: Id9e4d13d4e75f6f6381c675c4e9f72e9f4769d22
Merged-In: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
Bryce Lee [Thu, 25 May 2017 20:57:46 +0000 (13:57 -0700)]
Update ActivityStack#removeActivityFromHistoryLocked documentation.
Followup to ag/
2187696
Test: Documentation only
Bug:
37752430
Change-Id: I6e6a1e6727793037b398ef5b2da58d9efad4ada0
Bryce Lee [Thu, 25 May 2017 20:53:49 +0000 (20:53 +0000)]
Merge "Use cached keyguard flags during relaunch." into oc-dev
am:
9eb635c428
Change-Id: I33a077d03618fdebebdd36af2e0db103fbd7ce3d
Lorenzo Colitti [Thu, 25 May 2017 20:53:25 +0000 (20:53 +0000)]
Merge "Allow vendor code to link to libandroid_net."
Bryce Lee [Thu, 25 May 2017 20:51:09 +0000 (20:51 +0000)]
Merge "Do not remove task until all activities have been destroyed." into oc-dev
am:
f18c5862e8
Change-Id: Id35bc99e1c6871fc16935f901710c2f7b1fc567e
Winson Chung [Thu, 25 May 2017 20:45:51 +0000 (20:45 +0000)]
Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev am:
ef4e38f96f
am:
407e77c299
Change-Id: I5efc89253b286f49e82767063a41ca54698b4bf8
Bryce Lee [Thu, 25 May 2017 20:43:30 +0000 (20:43 +0000)]
Merge "Use cached keyguard flags during relaunch." into oc-dev
Bryce Lee [Thu, 25 May 2017 20:42:15 +0000 (20:42 +0000)]
Merge "Do not remove task until all activities have been destroyed." into oc-dev
Winson Chung [Thu, 25 May 2017 20:36:30 +0000 (20:36 +0000)]
Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev
am:
ef4e38f96f
Change-Id: If433030b4fdd9885fc67ee3025fc30fd60eb3880
OSDN Git Service
