TreeHugger Robot
92e29e94f7
Merge "Update account visibility API."
2016-12-21 01:18:02 +00:00
Amin Shaikh
18d7a5e95f
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392
...
am: 380341f6c8
2016-12-21 01:15:18 +00:00
Amin Shaikh
380341f6c8
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
...
am: c1940ef392
2016-12-21 01:10:44 +00:00
TreeHugger Robot
76848a7965
Merge "Clear and restore the calling ID."
2016-12-21 01:03:09 +00:00
Sundeep Ghuman
09f062b3c1
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489 am: c5443c1d5c
...
am: 2d68d1a13c
2016-12-21 01:01:20 +00:00
Treehugger Robot
c1940ef392
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
2016-12-21 01:00:19 +00:00
Jeremy Joslin
82d7207530
Stay bound to the most current active scorer.
...
This fixes the following issue:
1) Scorer A is active and bound.
2) A change occurs to Scorer A such that it is no longer the selected
scorer.
3) Scorer B is selected as the scorer and returned whenever
getActiveScorer() is queried.
4) Scorer A is never unbound because it isn't seen as the active
scorer.
5) Scorer B is never bound until its package changes in some way (or
the feature is disabled/enabled).
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest + manual testing.
Change-Id: I468a8c02a72f089f1fb778d150d945efe5485b88
2016-12-20 16:59:26 -08:00
Sundeep Ghuman
2d68d1a13c
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489
...
am: c5443c1d5c
2016-12-21 00:56:48 +00:00
Sundeep Ghuman
c5443c1d5c
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab
...
am: 6d749fb489
2016-12-21 00:51:49 +00:00
Sundeep Ghuman
6d749fb489
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
...
am: 31a8f712ab
2016-12-21 00:43:15 +00:00
TreeHugger Robot
89eaa33e11
Merge "Fast-path for ViewGroup#invalidateChild, invalidate tests"
2016-12-21 00:34:05 +00:00
Treehugger Robot
31a8f712ab
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
2016-12-21 00:28:48 +00:00
Dmitry Dementyev
527454795f
Update account visibility API.
...
Remove no longer used functions and in-memory visibility table.
Add stubs for new methods.
Actual implementation will be added in follow up CLs.
Bug: https://b.corp.google.com/issues/33046496
Test: manual tests, cts tests.
Change-Id: I990759b20c57df70bc944e27b84e59b9f77b9bd4
2016-12-20 15:44:55 -08:00
Jeremy Joslin
8f5521aa67
Clear and restore the calling ID.
...
Clear and restore the calling identity in IPC methods after asserting
the caller has the required permissions.
Fixed 2 tests in NetworkScoreServiceTest that were failing due to a
recent refactor.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33781319
Change-Id: Icd79751d12dcfe4af8026980aaa1f7bd463468dc
2016-12-20 15:44:06 -08:00
Marie Janssen
6c69241457
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
...
am: eac9538c5c
2016-12-20 23:43:28 +00:00
Marie Janssen
e5eb5bf932
Bluetooth: persist state when turning on from BLE am: fa9bec95a5
...
am: e7f0fd1d36
2016-12-20 23:42:29 +00:00
Andrew Sapperstein
f5bdf3df98
Merge "Add flags to send package name for feedback." into nyc-mr2-dev am: 72df83d117
...
am: 8392637afd
2016-12-20 23:39:52 +00:00
Marie Janssen
eac9538c5c
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
...
am: f77ca5fa18
2016-12-20 23:38:31 +00:00
Marie Janssen
e7f0fd1d36
Bluetooth: persist state when turning on from BLE
...
am: fa9bec95a5
2016-12-20 23:38:26 +00:00
Andrew Sapperstein
b9453be364
resolve merge conflicts of 4e10b37 to master
...
Change-Id: If5091133617285fdb7f3c0312e9e229ae8e53fe0
2016-12-20 15:31:32 -08:00
TreeHugger Robot
f77ca5fa18
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
2016-12-20 23:29:38 +00:00
Amin Shaikh
70b1c6ab40
Change fillColor for Wi-Fi badges to #FFFFFF.
...
Bug: 33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53
2016-12-20 15:28:34 -08:00
Sundeep Ghuman
d76e65bead
Create and implement a CacheListener inside WifiNetworkScoreCache.
...
Bug: 33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38
2016-12-20 15:07:01 -08:00
Andrew Sapperstein
8392637afd
Merge "Add flags to send package name for feedback." into nyc-mr2-dev
...
am: 72df83d117
2016-12-20 23:03:54 +00:00
Andrew Sapperstein
4e10b37b71
Add flags to send package name for feedback.
...
am: 8dc3b870a0
2016-12-20 23:03:26 +00:00
TreeHugger Robot
72df83d117
Merge "Add flags to send package name for feedback." into nyc-mr2-dev
2016-12-20 22:57:19 +00:00
Amin Shaikh
fd82f310db
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5 am: 9209505c85
...
am: 6a7dbcb63c
2016-12-20 22:52:43 +00:00
Amin Shaikh
6a7dbcb63c
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5
...
am: 9209505c85
2016-12-20 22:48:15 +00:00
Amin Shaikh
9209505c85
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd
...
am: a81a4163f5
2016-12-20 22:39:41 +00:00
Amin Shaikh
a81a4163f5
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
...
am: f456ddf3fd
2016-12-20 22:35:06 +00:00
Brad Ebinger
eab25ae197
Adds custom call forwarding block while roaming carrier config key
...
Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.
Test: Manual
Bug: 30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177
2016-12-20 14:34:52 -08:00
TreeHugger Robot
0e4b9cd97d
Merge "Expose ScanResult#untrusted as a @SystemApi."
2016-12-20 22:30:35 +00:00
TreeHugger Robot
c88a1919b3
Merge "Settings recovery support"
2016-12-20 22:28:49 +00:00
Tim Murray
8ab67096fe
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev am: a03c3e74a4
...
am: a6b0ad5821
2016-12-20 22:27:23 +00:00
Tim Murray
74d37398c7
Fix incorrect FIFO cgroup assignment. am: 2dc4a74806
...
am: 220286ef0e
2016-12-20 22:26:16 +00:00
Treehugger Robot
f456ddf3fd
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
2016-12-20 22:24:13 +00:00
Tim Murray
a6b0ad5821
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
...
am: a03c3e74a4
2016-12-20 22:17:35 +00:00
Tim Murray
220286ef0e
Fix incorrect FIFO cgroup assignment.
...
am: 2dc4a74806
2016-12-20 22:17:29 +00:00
TreeHugger Robot
a03c3e74a4
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
2016-12-20 22:10:03 +00:00
Julia Reynolds
f4af65bbd6
Don't automatically remove autogroup summaries
...
Unless there are no notifications left that need to be autogrouped.
Change-Id: I76f90cd083273d1babf1209e3c509d213deffa9c
Fixes: 28612382
Test: runtest systemui-notification
2016-12-20 22:08:09 +00:00
Julia Reynolds
e886405dbe
Expose hidden constant.
...
Change-Id: If86f23ada967047dc63256d9c2675e1c2b229e48
Fixes: 29103412
Test: n/a
2016-12-20 22:07:41 +00:00
Manu Cornet
5548196fe5
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev am: 5ef12f244c
...
am: 842b596000
2016-12-20 22:05:58 +00:00
Manu Cornet
cc63864093
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2 am: bf8e290376
...
am: 0cfa646f73
2016-12-20 22:05:02 +00:00
Tim Murray
20375fe124
Fix incorrect FIFO cgroup assignment.
...
bug 33745094
Test: builds
Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f
2016-12-20 14:04:44 -08:00
Xiaohui Chen
524cd9bb39
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev am: 2d6accd7a9
...
am: 77215beb95
2016-12-20 21:58:42 +00:00
Xiaohui Chen
d925fef612
sysui: update sw900dp navbar sizes am: c48f07bc82
...
am: 4ec4c6f212
2016-12-20 21:57:22 +00:00
Manu Cornet
842b596000
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev
...
am: 5ef12f244c
2016-12-20 21:57:13 +00:00
Manu Cornet
0cfa646f73
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
...
am: bf8e290376
2016-12-20 21:57:08 +00:00
Xiaohui Chen
77215beb95
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
...
am: 2d6accd7a9
2016-12-20 21:52:46 +00:00
Xiaohui Chen
4ec4c6f212
sysui: update sw900dp navbar sizes
...
am: c48f07bc82
2016-12-20 21:52:41 +00:00
