Jeremy Joslin
8bdad345cc
Migrate the NETWORK_SCORER_APP to NETWORK_RECOMMENDATIONS_ENABLED.
...
If NETWORK_SCORER_APP has a non-null value then enabled
NETWORK_RECOMMENDATIONS_ENABLED.
Test: runtest --path frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
BUG: 32913919
Change-Id: Ibea34f0a17539e9c583898dc336f807f92b33c54
2016-12-14 11:54:32 -08:00
Matthew Ng
ca4c1a34fd
Get correct insets of the phone screen at boot
...
Before places such as
DockedStackDividerController.initSnapAlgorithmForRotations() tries to
run getStableInsetsLw() will get no insets on boot (via
onConfigurationChanged) because the navigationbar and statusbar have not
been added yet. This would leads to some miscalculations until
configuration changes such as rotating the screen.
Test: manual - logged the inset values on bootup with adb logcat
Change-Id: If07c8c007cb355dc418ff987fbb36ce104192379
2016-12-14 11:53:42 -08:00
Treehugger Robot
e89ed4a001
Merge "Add an IPC for requesting network scores."
2016-12-14 19:47:48 +00:00
Treehugger Robot
f34bdf7676
Merge "Bluetooth: log message improvements"
2016-12-14 19:47:32 +00:00
Julius D'souza
d0797e0bbd
Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 7af83d0e5a" into nyc-mr2-dev-plus-aosp
...
am: 04acb73b85
2016-12-14 19:37:30 +00:00
Julius D'souza
3d6b925ea2
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 7af83d0e5a
...
am: d02ff5c066
2016-12-14 19:37:24 +00:00
Julius D'souza
001c3238bb
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 6b953b0f0b
...
am: f8c511e533
2016-12-14 19:36:10 +00:00
Android Build Merger (Role)
04acb73b85
Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 7af83d0e5a" into nyc-mr2-dev-plus-aosp
2016-12-14 19:30:52 +00:00
Julius D'souza
d02ff5c066
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435
...
am: 7af83d0e5a
2016-12-14 19:30:03 +00:00
Julius D'souza
f8c511e533
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435
...
am: 6b953b0f0b
2016-12-14 19:30:00 +00:00
Jeff Davidson
27574b22a8
Merge "Add Log.wtf when getSummaryForAllUid NPEs."
2016-12-14 19:29:15 +00:00
Kang Li
b431d715a3
Merge "Add Sharing Histories to UsageStatsManager."
2016-12-14 19:26:34 +00:00
Julius D'souza
6b953b0f0b
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa
...
am: 1838237435
2016-12-14 19:24:10 +00:00
Julius D'souza
7af83d0e5a
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa
...
am: 1838237435
2016-12-14 19:24:01 +00:00
Julius D'souza
1838237435
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71
...
am: 8cc9f081aa
2016-12-14 19:18:04 +00:00
Esteban Talavera
06fd71abdf
Merge "Create DISALLOW_{ADD,REMOVE}_MANAGED_PROFILE user restrictions"
2016-12-14 19:16:26 +00:00
TreeHugger Robot
e80dd223fe
Merge "Fixes minimized state in DividerController when dismissing docked stack"
2016-12-14 19:15:38 +00:00
Julius D'souza
8cc9f081aa
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7
...
am: 20081c4e71
2016-12-14 19:11:59 +00:00
Julius D'souza
20081c4e71
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8
...
am: af0b547fc7
2016-12-14 19:06:29 +00:00
Lei Yu
5ed0692b25
Merge "Change animation based on visibility of the drawable"
2016-12-14 19:00:56 +00:00
Julius D'souza
af0b547fc7
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours
...
am: 7a69e8f3d8
2016-12-14 19:00:38 +00:00
Julius D'souza
7a69e8f3d8
fix case issues with mGoingIdleWakeLock in DeviceIdleController
...
am: e6f8cb29ec
2016-12-14 18:54:02 +00:00
Lei Yu
7bf650a65e
Merge "Add tint for ic_menu.xml"
2016-12-14 18:51:20 +00:00
Phil Weaver
9a14b56b60
Merge "Add null check to a11y interrupt."
2016-12-14 18:49:30 +00:00
Android Build Merger (Role)
223182e7ad
Merge "Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp am: 3039f42e67 -s ours"
2016-12-14 18:47:12 +00:00
Android Build Merger (Role)
40ac6b0e94
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours am: eb9e0555f4 -s ours"
2016-12-14 18:46:51 +00:00
Peeyush Agarwal
50db731b54
Implement requestKeyboardShortcuts for PopupDecorView
...
A call to requestKeyboardShortcuts from popup menu might be dispatched
to PopupDecorView or DecorView depending on WindowManagerService's
focusedWindow at that moment.
In case it gets dispatched to PopupDecorView, we would like to resend it
to parent activity's decor view (which can then handle it
appropriately). The change adds a notion of mParentRootView which keeps
track of popup's parent's decor view. The request is then routed
appropriately so as to display the corresponding shortcuts. mAnchor
cannot be used as it gets nulled (by dismiss) by the time
requestKeyboardShortcuts gets called.
Bug: 31850671
Change-Id: I0ee3a1c7801c6d3fce8748bc7513382f250c5c63
Fixes: 31850671
Test: cts-tradefed run cts-dev -m CtsAppTestCases -t
android.app.cts.ActivityKeyboardShortcutsTest#testRequestShowKeyboardShortcuts
2016-12-14 18:46:39 +00:00
Julius D'souza
51ffef2596
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp
...
am: 3039f42e67
2016-12-14 18:46:04 +00:00
Julius D'souza
5bdfa357e0
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours
...
am: eb9e0555f4
2016-12-14 18:46:00 +00:00
Android Build Merger (Role)
d3e7c8a3a7
Merge "Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005" into nyc-mr2-dev-plus-aosp am: 13b2cfdfdf"
2016-12-14 18:45:33 +00:00
Android Build Merger (Role)
81ac9b917b
Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005 am: fddf68261e"
2016-12-14 18:45:10 +00:00
Philip P. Moltmann
5a4c336955
Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005" into nyc-mr2-dev-plus-aosp
...
am: 13b2cfdfdf
2016-12-14 18:44:24 +00:00
Philip P. Moltmann
98b0046c65
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005
...
am: fddf68261e
2016-12-14 18:44:15 +00:00
Android Build Merger (Role)
ae3f4ffdce
Merge "Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp am: c20a6d99c5"
2016-12-14 18:43:45 +00:00
TreeHugger Robot
a97a01e5a2
Merge "Added supports-split-screen-multi-window command to am"
2016-12-14 18:43:28 +00:00
Philip P. Moltmann
3c2034fbaf
Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp
...
am: c20a6d99c5
2016-12-14 18:42:38 +00:00
Philip P. Moltmann
b9ecda6dd0
Do not write if apply() did not change the file. am: ea10cc0fbb
...
am: fbf2adaf6e
2016-12-14 18:42:31 +00:00
Philip P. Moltmann
988ff9649e
Merge "Only persist last Shared Preferences state am: 31d6889f4c" into nyc-mr2-dev-plus-aosp
...
am: b152876f2d
2016-12-14 18:40:54 +00:00
Philip P. Moltmann
77b497dc26
Only persist last Shared Preferences state am: 31d6889f4c
...
am: 2f1bb85277
2016-12-14 18:40:46 +00:00
Julius D'souza
e6f8cb29ec
fix case issues with mGoingIdleWakeLock in DeviceIdleController
...
Bug: 31900521
Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
2016-12-14 10:31:12 -08:00
TreeHugger Robot
94b5c92a35
Merge "SkClipOp is now an enum class"
2016-12-14 18:29:58 +00:00
Android Build Merger (Role)
6b45e658c3
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: 323f2dbc46 -s ours am: d8a6e8eaa2 -s ours"
2016-12-14 18:28:51 +00:00
Julius D'souza
b12f654aac
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: 323f2dbc46 -s ours
...
am: d8a6e8eaa2
2016-12-14 18:28:05 +00:00
Wyatt Riley
95a310dbdf
Merge "Restoring Network Available Notification to AGnssRil"
2016-12-14 18:25:23 +00:00
Android Build Merger (Role)
3039f42e67
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp
2016-12-14 18:24:45 +00:00
Julius D'souza
eb9e0555f4
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours
...
am: a481fd31cf
2016-12-14 18:23:54 +00:00
Android Build Merger (Role)
13b2cfdfdf
Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005" into nyc-mr2-dev-plus-aosp
2016-12-14 18:23:36 +00:00
Android Build Merger (Role)
c20a6d99c5
Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp
2016-12-14 18:23:14 +00:00
Android Build Merger (Role)
b152876f2d
Merge "Only persist last Shared Preferences state am: 31d6889f4c" into nyc-mr2-dev-plus-aosp
2016-12-14 18:22:48 +00:00
sergeyv
19b4b01916
Fix getConfig function for hw bitmaps
...
Test: HardwareBitmapTests#testGetConfig
bug:30999911
Change-Id: I93a1c9fc88567ada2462a7a3b6cef8f796844e15
2016-12-14 10:21:55 -08:00
