OSDN Git Service
Jiaquan He [Thu, 29 Dec 2016 01:51:30 +0000 (01:51 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
am:
c87fcb0963
Change-Id: I5f2a91b5f52f2dd3ebc564c127a1f939a4bc20a4
Jiaquan He [Thu, 29 Dec 2016 01:51:24 +0000 (01:51 +0000)]
Move grid checking into the layout algorithm.
am:
26f637b555
Change-Id: Ie65d71bd7f6edb5e92f6dd331999424a592c8073
TreeHugger Robot [Thu, 29 Dec 2016 01:41:52 +0000 (01:41 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:21:55 +0000 (00:21 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
am:
3b430f7d0c
Change-Id: I816b8170fef81e02d2c9fc99ba0f236d7f2cf080
Manu Cornet [Thu, 29 Dec 2016 00:21:48 +0000 (00:21 +0000)]
2D recents: show all close buttons right away
am:
8ff7854c4b
Change-Id: I18e3729f5e09601a6548647fa16ba90bf2147cb0
Jiaquan He [Thu, 29 Dec 2016 00:19:53 +0000 (00:19 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
am:
55a684ff65
Change-Id: Ife9a1c5276668ceddc662fdc2e385b7f0570b660
Manu Cornet [Thu, 29 Dec 2016 00:19:48 +0000 (00:19 +0000)]
2D Recents: use a slightly darker scrim background
am:
48de4e6afe
Change-Id: I33a961dbd1741d72fa86a0cde0b2e60b76271955
Jiaquan He [Thu, 29 Dec 2016 00:13:14 +0000 (00:13 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:12:48 +0000 (00:12 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
Jiaquan He [Tue, 27 Dec 2016 22:44:14 +0000 (14:44 -0800)]
Move grid checking into the layout algorithm.
We move grid layout checking into the layout algorithm, so that we can
hide more computation from the views.
Bug:
32101881
Change-Id: I174fe33ef7ed3c04987771dbb42d831a4b9bdab2
Android Build Merger (Role) [Thu, 29 Dec 2016 00:00:21 +0000 (00:00 +0000)]
Merge "Merge "Resue TaskView information." into nyc-mr2-dev am:
6335e35d51" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 28 Dec 2016 23:59:54 +0000 (23:59 +0000)]
Merge "Resue TaskView information. am:
0a5e2d6b93" into nyc-mr2-dev-plus-aosp
Jiaquan He [Wed, 28 Dec 2016 23:58:54 +0000 (23:58 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
am:
6335e35d51
Change-Id: I6498fbdb0c948913da95a5beccaa9feeb5f8f1ed
Jiaquan He [Wed, 28 Dec 2016 23:58:49 +0000 (23:58 +0000)]
Resue TaskView information.
am:
0a5e2d6b93
Change-Id: I0d998b0e31dedb48ef284386811fe67fbda6c981
Adrian Roos [Wed, 28 Dec 2016 23:58:43 +0000 (23:58 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125 am:
3c0a8bba3c
am:
b12ed1e10f
Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865
Adrian Roos [Wed, 28 Dec 2016 23:51:30 +0000 (23:51 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125
am:
3c0a8bba3c
Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8
TreeHugger Robot [Wed, 28 Dec 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
Adrian Roos [Wed, 28 Dec 2016 23:43:46 +0000 (23:43 +0000)]
Merge "QS - Fix race condition in accessibility"
am:
302efd6125
Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42
Adrian Roos [Wed, 28 Dec 2016 23:29:58 +0000 (23:29 +0000)]
Merge "QS - Fix race condition in accessibility"
Andrew Solovay [Wed, 28 Dec 2016 20:45:39 +0000 (20:45 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af
am:
602c3c7073
Change-Id: I496cfe09a488f9bfc278e10e72423da3e2406c6f
Andrew Solovay [Wed, 28 Dec 2016 20:44:32 +0000 (20:44 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d
am:
23473e8851
Change-Id: Id8590431f317068e0f851f0b77862b825734eae6
Andrew Solovay [Wed, 28 Dec 2016 20:38:40 +0000 (20:38 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc am:
897df2b5af
am:
563ca19747
Change-Id: I133647a253f62208c7ee6deb6cf15a955f09ec8e
Andrew Solovay [Wed, 28 Dec 2016 20:37:36 +0000 (20:37 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33 am:
2891357f4d
am:
ff501e5e5f
Change-Id: I8e7bf9b66c92ed5db45007084075fca36ccaa0c8
Andrew Solovay [Wed, 28 Dec 2016 20:32:13 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I06cea8a7d84e02346047e0e0bf88cf30f9da4120
Andrew Solovay [Wed, 28 Dec 2016 20:32:03 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
Andrew Solovay [Wed, 28 Dec 2016 20:31:08 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
Andrew Solovay [Wed, 28 Dec 2016 20:31:02 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am:
61dad4b2fc
Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am:
40ba793b33
Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
Jeremy Joslin [Wed, 28 Dec 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b am:
b12af1b18a
am:
3ba918c9d3
Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
Jeremy Joslin [Wed, 28 Dec 2016 20:10:35 +0000 (20:10 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b
am:
b12af1b18a
Change-Id: I65d005aa303102b212c93b0b2702941bf554526d
Jeremy Joslin [Wed, 28 Dec 2016 20:03:05 +0000 (20:03 +0000)]
Merge "Cleanup the evaluateBinding() method."
am:
c26aa87a2b
Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd
Treehugger Robot [Wed, 28 Dec 2016 19:52:41 +0000 (19:52 +0000)]
Merge "Cleanup the evaluateBinding() method."
Jiaquan He [Wed, 28 Dec 2016 19:20:06 +0000 (19:20 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
am:
632332c259
Change-Id: I2d69e69b9e00d076f2707a690137d5278fd2107c
Jiaquan He [Wed, 28 Dec 2016 19:20:00 +0000 (19:20 +0000)]
Check split screen properly.
am:
5fac212e8b
Change-Id: Ica99e37798a2447acdbddb7b29b6e67655870b1d
Jiaquan He [Wed, 28 Dec 2016 19:12:23 +0000 (19:12 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
Jeremy Joslin [Wed, 21 Dec 2016 21:35:02 +0000 (13:35 -0800)]
Cleanup the evaluateBinding() method.
Small refactor to remove 1 level of nesting.
Test: build, run.
Change-Id: Ic46a65036b207ff73fefced914e0928de2f2b500
Merged-In: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
Jorim Jaggi [Wed, 28 Dec 2016 17:12:38 +0000 (17:12 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
am:
8812fb0695
Change-Id: I4a5ccf55bf02ba25d4ce652ac86cdba20814d661
Jorim Jaggi [Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)]
Change screen pinning back to old gesture
am:
4e723e6087
Change-Id: I83dee36d5d3b16adbf740dd6495e7945bf0236ef
Jorim Jaggi [Wed, 28 Dec 2016 17:01:18 +0000 (17:01 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
Jorim Jaggi [Wed, 14 Dec 2016 19:02:39 +0000 (11:02 -0800)]
Change screen pinning back to old gesture
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.
Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Merged-In: Icd7347aa9c60af00fdb0b3991baabb730552d097
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
Fixes:
32440409
Joe LaPenna [Wed, 28 Dec 2016 03:03:33 +0000 (03:03 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider." am:
1471ad3ea7 am:
ddff9e586c
am:
bef179f094
Change-Id: I4b8a42cb9499e9ba2beab0b39375485d1898b07c
Joe LaPenna [Wed, 28 Dec 2016 02:56:34 +0000 (02:56 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider." am:
1471ad3ea7
am:
ddff9e586c
Change-Id: Ie86fbc9c427e3f238e0d83a03240fc7045a61e5e
Joe LaPenna [Wed, 28 Dec 2016 02:49:01 +0000 (02:49 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider."
am:
1471ad3ea7
Change-Id: I9b052e48c067dc50111c6ce6bf1b200232676aa2
Treehugger Robot [Wed, 28 Dec 2016 02:36:22 +0000 (02:36 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider."
Adrian Roos [Tue, 27 Dec 2016 23:49:53 +0000 (23:49 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am:
02f07cce35
Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
Adrian Roos [Tue, 27 Dec 2016 23:49:46 +0000 (23:49 +0000)]
Ambient Display: Fix race with coloring and redaction
am:
e5726a2082
Change-Id: I9c2c42692f01b7665fb11d6e0f47c707d3c630fc
Jiaquan He [Tue, 27 Dec 2016 19:05:44 +0000 (11:05 -0800)]
Resue TaskView information.
In this commit we calculate all the TaskView information we need
during initialization, so that we don't need to calculate again
unless any configuration is changed.
Bug:
32101881
Change-Id: I433688d0a05c69064d0da5268b61340cecdbfe74
Adrian Roos [Tue, 27 Dec 2016 23:36:56 +0000 (23:36 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
Adrian Roos [Tue, 27 Dec 2016 23:29:54 +0000 (23:29 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
am:
52133e6916
Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b
Adrian Roos [Tue, 27 Dec 2016 23:29:47 +0000 (23:29 +0000)]
Keyguard: Don't lock on SIM removed during shutdown
am:
1f8025adf2
Change-Id: I22b34aa27c6540bf661081950a51eb275894c032
Adrian Roos [Tue, 27 Dec 2016 23:20:43 +0000 (23:20 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
Joe LaPenna [Tue, 27 Dec 2016 22:50:14 +0000 (14:50 -0800)]
Send RECOMMEND_NETWORKS action when binding to provider.
Some services use action to disambiguate which binder to return in
onBind.
Test: built && installed && bound.
BUG:
33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f
Merged-In: I83ae41b472c597661b93f5467b64b258e9056f5f
Jiaquan He [Fri, 23 Dec 2016 00:47:59 +0000 (16:47 -0800)]
Check split screen properly.
This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.
Bug:
33847223
Bug:
32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c
Selim Cinek [Tue, 27 Dec 2016 19:22:10 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
am:
cbb057d3da
Change-Id: I2c4f83b83dfa685c8b838b9206e26231a0b9aac0
Selim Cinek [Tue, 27 Dec 2016 19:22:04 +0000 (19:22 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
am:
966045d070
Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
TreeHugger Robot [Tue, 27 Dec 2016 19:08:55 +0000 (19:08 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
Selim Cinek [Tue, 27 Dec 2016 11:06:35 +0000 (11:06 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit
84980c7a93e93e7134c0198212e222e11eb5ccbd.
Bug:
33895226
Bug:
30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
Adrian Roos [Tue, 27 Dec 2016 18:12:13 +0000 (10:12 -0800)]
Keyguard: Don't lock on SIM removed during shutdown
Fixes a glitch where the SIM is considered removed because
we turn off the radio during shutdown.
Change-Id: Id783114f557b87051b833ea84cecc862f910c6ca
Fixes:
33788000
Jorim Jaggi [Tue, 27 Dec 2016 16:37:50 +0000 (16:37 +0000)]
Merge "Fix window transformation related issue" am:
8760e60da5 am:
1200cfb48d
am:
a4a4cfc8f5
Change-Id: Ib6a4dcb09317891decacff94340ac8b015b8db74
Jorim Jaggi [Tue, 27 Dec 2016 16:32:24 +0000 (16:32 +0000)]
Merge "Fix window transformation related issue" am:
8760e60da5
am:
1200cfb48d
Change-Id: I6a105898193544119e3ca7a911faed67e46e539d
Jorim Jaggi [Tue, 27 Dec 2016 16:23:49 +0000 (16:23 +0000)]
Merge "Fix window transformation related issue"
am:
8760e60da5
Change-Id: I686b637ea76402c4d4c666b60ece83755a24a5d1
Jorim Jaggi [Tue, 27 Dec 2016 16:08:43 +0000 (16:08 +0000)]
Merge "Fix window transformation related issue"
dooyoung.hwang [Thu, 22 Dec 2016 11:04:20 +0000 (20:04 +0900)]
QS - Fix race condition in accessibility
When users try to open panel, initialization of accessibility is called
in Main Thread by this callstack.
at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.setFlags
at android.view.View.setVisibility
at com.android.systemui.qs.QSContainer.updateQsState
at com.android.systemui.qs.QSContainer.setExpanded
at com.android.systemui.statusbar.phone.NotificationPanelView.updateQsState
And another initialization is tried in QSTileHost Thread by this callstack.
at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.ViewGroup.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.announceForAccessibility
at com.android.systemui.qs.QSPanel.onAnnouncementRequested
at com.android.systemui.qs.QSTile.handleStateChanged
This race condition can cause crashes, because the same ArrayList
(mPreSortedChildren or mTempArrayList in ViewGroup) is modified by two
different thread.
Test : manual
Change-Id: I9e0ad1fef4be7dc378463c06d10854e0e4c5b3d6
Lorenzo Colitti [Fri, 23 Dec 2016 08:26:29 +0000 (08:26 +0000)]
Don't loop forever on zero-length ICMPv6 ND options.
am:
2f157c421a
Change-Id: Id8fbe5361b8a826677638213eed565be333f2c4d
Lorenzo Colitti [Fri, 23 Dec 2016 04:54:50 +0000 (13:54 +0900)]
Don't loop forever on zero-length ICMPv6 ND options.
Bug:
33828433
Change-Id: Ie1905167126c8c8f3896eaa5e36cd006ca354e99
Santos Cordon [Thu, 22 Dec 2016 23:58:15 +0000 (23:58 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
am:
cfdf27f24b
Change-Id: I1edc922f659f83f36102a3e6d3e36e2a6f74716f
Santos Cordon [Thu, 22 Dec 2016 23:58:05 +0000 (23:58 +0000)]
Add Brightness setting for VR Mode.
am:
84980c7a93
Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2
Santos Cordon [Thu, 22 Dec 2016 23:49:16 +0000 (23:49 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Tue, 20 Sep 2016 22:50:35 +0000 (15:50 -0700)]
Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.
Bug:
30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Joe LaPenna [Thu, 22 Dec 2016 21:51:57 +0000 (21:51 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig." am:
4ce798f45f am:
6f87331902
am:
715acea102
Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87
Joe LaPenna [Thu, 22 Dec 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig." am:
4ce798f45f
am:
6f87331902
Change-Id: I3681893e43949060922f72c65f8f106090005d14
Joe LaPenna [Thu, 22 Dec 2016 21:41:23 +0000 (21:41 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
am:
4ce798f45f
Change-Id: I7343422cd3405628d6c2b90092af631b77eb37a7
Treehugger Robot [Thu, 22 Dec 2016 21:29:56 +0000 (21:29 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
pkanwar [Thu, 22 Dec 2016 21:16:53 +0000 (13:16 -0800)]
Revert "DO NOT MERGE: Add API to indicate carrier networks."
These changes are not applicable for aosp and will be implemented in
master.
This reverts commit
9f47a5d85eca1f93833b328dea3d31fc36d79591.
Bug:
31003437
Daniel Nishi [Thu, 22 Dec 2016 21:10:00 +0000 (21:10 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
am:
dfe1bc2f34
Change-Id: I1c06fad6316f3cc34b917cbbf359d838e01d650e
Daniel Nishi [Thu, 22 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Fix a bug where the package stats query timeout may crash.
am:
cf76a16e66
Change-Id: Ibc146f89412387eb05a164c2a1969210fcea4262
TreeHugger Robot [Thu, 22 Dec 2016 21:03:00 +0000 (21:03 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
Steven Moreland [Thu, 22 Dec 2016 20:58:54 +0000 (20:58 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder" am:
380697ca79 am:
b6022b9fa0
am:
5e1efa2cc7
Change-Id: I190fab7adf1222c71d6d5d71ab8cbe2928600a34
Pankaj Kanwar [Thu, 22 Dec 2016 20:54:11 +0000 (20:54 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
am:
f6d8e1f635
Change-Id: I1412b56245583d65f382613fd466ede1efaa298f
pkanwar [Thu, 22 Dec 2016 20:53:58 +0000 (20:53 +0000)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
am:
57f383709b
Change-Id: Ieb3aa3a0755bcd16759d91852980bcdf5373eaa8
Steven Moreland [Thu, 22 Dec 2016 20:53:52 +0000 (20:53 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder" am:
380697ca79
am:
b6022b9fa0
Change-Id: I7135d790ed299f21975c5b27b534714d83ccf440
Steven Moreland [Thu, 22 Dec 2016 20:48:17 +0000 (20:48 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"
am:
380697ca79
Change-Id: I301b1f9e9344a8b314a6debff3fef2e7c8362f1a
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
Treehugger Robot [Thu, 22 Dec 2016 20:41:01 +0000 (20:41 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"
Joe LaPenna [Thu, 22 Dec 2016 04:17:08 +0000 (20:17 -0800)]
Add simplified_network_settings_bool to CarrierConfig.
Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.
BUG:
33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Alex Klyubin [Thu, 22 Dec 2016 19:32:47 +0000 (19:32 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values" am:
933ea68aca am:
e988e8f1f6
am:
8e23aa4ee6
Change-Id: I13926b884509c4018d8ced24a80acc3e8c2b5d7a
Daniel Nishi [Thu, 22 Dec 2016 19:06:51 +0000 (11:06 -0800)]
Fix a bug where the package stats query timeout may crash.
This adds a null-check to verify that we got real data before
trying to use it and increases the timeout time to reduce the
likelihood of timing out.
Test: FrameworkServicesTests
Bug:
33836034
Change-Id: Ia1ad4aba05c5c4fb8688fc9fc94df344f736e396
Sundeep Ghuman [Thu, 22 Dec 2016 19:27:29 +0000 (19:27 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am:
5e055b6a18 am:
80f1e2e52a
am:
43e86c1ca6
Change-Id: If7acfafd1cb8e52b778cf8fb347e1a0d509d7f62
Sundeep Ghuman [Thu, 22 Dec 2016 19:26:05 +0000 (19:26 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key." am:
425af45d02 am:
41577a0029
am:
bfc0bfe645
Change-Id: Ia3d455791e3f219a3e0cff3b6946184757487d71
Jeremy Joslin [Thu, 22 Dec 2016 19:24:17 +0000 (19:24 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4 am:
8eff13b521
am:
deddce7ff6
Change-Id: I0026c9b1fed0e8eeab95a1d0c03f8235c7643c62
Alex Klyubin [Thu, 22 Dec 2016 19:22:46 +0000 (19:22 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values" am:
933ea68aca
am:
e988e8f1f6
Change-Id: Icce6e31723d4dac12cf2c2e389e69c067dd66a91
Jeremy Joslin [Thu, 22 Dec 2016 19:22:44 +0000 (19:22 +0000)]
Stay bound to the most current active scorer. am:
b1365852cc am:
d79019a616
am:
268176317b
Change-Id: I3fcfd02759c9748b4e00a5e825b670259c0d0263
Jeremy Joslin [Thu, 22 Dec 2016 19:21:45 +0000 (19:21 +0000)]
Clear and restore the calling ID. am:
29ed4a99bf am:
3588b8d44c
am:
3f32d12be0
Change-Id: I2cbf3ca1ff0a743de1b08fad467027ec59333def
Sundeep Ghuman [Thu, 22 Dec 2016 19:16:13 +0000 (19:16 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am:
5e055b6a18
am:
80f1e2e52a
Change-Id: I08fe2e52a4926dc3d2fae02bf90c3fcf5b60ee82
Sundeep Ghuman [Thu, 22 Dec 2016 19:14:48 +0000 (19:14 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key." am:
425af45d02
am:
41577a0029
Change-Id: I7807d92a705a8ec9d9c7b04159e1cd2290846e38
Jeremy Joslin [Thu, 22 Dec 2016 19:12:47 +0000 (19:12 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4
am:
8eff13b521
Change-Id: I758eaa79b9707073fcfea1454e59c48c58a80e4d
pkanwar [Thu, 22 Dec 2016 19:12:02 +0000 (11:12 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug:
31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
Jeremy Joslin [Thu, 22 Dec 2016 19:11:48 +0000 (19:11 +0000)]
Stay bound to the most current active scorer. am:
b1365852cc
am:
d79019a616
Change-Id: Ib3c7a4cdaea80ad4ac84c6baa92d879396c0f483