George Mount
0882330c39
Merge "Fix NPE when combining pop with add transaction."
2017-03-02 15:12:30 +00:00
Hugo Benichi
00a5f2a658
Merge "ConnectivityManager: no double NetworkCallback registration" am: 06a192fa49 am: 5983a772cb
...
am: 974e83cc0b
2017-03-02 08:12:09 +00:00
Hugo Benichi
974e83cc0b
Merge "ConnectivityManager: no double NetworkCallback registration" am: 06a192fa49
...
am: 5983a772cb
2017-03-02 08:08:01 +00:00
Hugo Benichi
5983a772cb
Merge "ConnectivityManager: no double NetworkCallback registration"
...
am: 06a192fa49
2017-03-02 08:04:03 +00:00
Treehugger Robot
06a192fa49
Merge "ConnectivityManager: no double NetworkCallback registration"
2017-03-02 07:56:26 +00:00
Diego Perez
a624099635
Merge "Add perf tests to Main"
2017-03-02 07:42:16 +00:00
Jack Yu
af529a0372
Merge "Added two new RIL commands support" am: d7b60d7869 am: 01cfdb4f3a
...
am: b5d25274d7
2017-03-02 06:52:35 +00:00
TreeHugger Robot
331a6f5cee
Merge changes I0df55b11,I1cbeb477
...
* changes:
Don't destroy preserved surfaces when cleaning up on resume.
Don't limited pinned tasks to content area.
2017-03-02 06:22:06 +00:00
Hugo Benichi
faa70976b4
ConnectivityManager: no double NetworkCallback registration
...
Test: new test in ConnectivityManagerTest
Bug: 20701525
Change-Id: I205333d31d43e6e6c7fe704ce63b458065f345ce
2017-03-02 15:19:37 +09:00
Jack Yu
b5d25274d7
Merge "Added two new RIL commands support" am: d7b60d7869
...
am: 01cfdb4f3a
2017-03-02 06:18:13 +00:00
Jack Yu
01cfdb4f3a
Merge "Added two new RIL commands support"
...
am: d7b60d7869
2017-03-02 06:11:24 +00:00
Treehugger Robot
d7b60d7869
Merge "Added two new RIL commands support"
2017-03-02 06:02:20 +00:00
TreeHugger Robot
e01e80a671
Merge "Added two new RIL commands support"
2017-03-02 04:59:01 +00:00
Bryce Lee
b85ec1c473
Merge "Clean up closing apps list when clearing anAppWindowToken's task."
2017-03-02 04:34:43 +00:00
Robert Carr
db2f6e6edf
Don't destroy preserved surfaces when cleaning up on resume.
...
We clean up surfaces from apps which were stopping (mDestroying=true)
but not stopped when we resume, as described in commit 45e6d2deb66557
2017-03-01 20:17:58 -08:00
TreeHugger Robot
9c47358b2c
Merge "Improve dumpsys output for AlarmMAnager"
2017-03-02 03:42:46 +00:00
Robert Carr
e65a1c4fde
Don't limited pinned tasks to content area.
...
During the pinned animation from fullscreen we
layout the window for as if it were fullscreen. However
this logic determines that we then overlap the content area
and unhelpfully tries to adjust us.
Test: Manual.
Change-Id: I1cbeb47731062f95c631e8cbd1f0601085d1762f
2017-03-01 19:35:52 -08:00
Jack Yu
1bab118bed
Added two new RIL commands support
...
Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.
Test: telephony sanity tests
bug: 32223897, 20125037, 28294587
Merged-In: I148a4322dfab2d8d84faf6505fb89dfc290411e3
Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3
2017-03-02 03:29:07 +00:00
Jack Yu
da70ca69fd
Added two new RIL commands support
...
Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.
Test: telephony sanity tests
bug: 32223897, 20125037, 28294587
Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3
2017-03-01 19:21:22 -08:00
David Christie
c4927db35a
Merge "Create PackageManager.isInstantApp API to query whether a given package name is an instant app."
2017-03-02 03:18:05 +00:00
Elliott Hughes
7f7ae3f990
Merge "Basic javadoc for android.os.UpdateEngine." am: cbafc8d682 am: 91c1048bc7
...
am: 99cca40d29
2017-03-02 03:15:10 +00:00
Elliott Hughes
99cca40d29
Merge "Basic javadoc for android.os.UpdateEngine." am: cbafc8d682
...
am: 91c1048bc7
2017-03-02 03:07:33 +00:00
TreeHugger Robot
1bef83f613
Merge "Added inputType to Assist API."
2017-03-02 03:01:50 +00:00
Elliott Hughes
91c1048bc7
Merge "Basic javadoc for android.os.UpdateEngine."
...
am: cbafc8d682
2017-03-02 03:01:34 +00:00
Elliott Hughes
cbafc8d682
Merge "Basic javadoc for android.os.UpdateEngine."
2017-03-02 02:52:09 +00:00
Steven Moreland
b2df16ae1a
Merge "LightService: recover if light hal fails."
2017-03-02 02:21:25 +00:00
Makoto Onuki
33955e10bb
Improve dumpsys output for AlarmMAnager
...
Test: manual test with dumpsys alarm
Change-Id: I788be58d3cdc5e10045908b6d4501933b1603cb9
2017-03-01 18:11:00 -08:00
Fyodor Kupolov
be7febfd7d
Merge "Log user running states"
2017-03-02 01:33:59 +00:00
TreeHugger Robot
85d0eee1a8
Merge "Fixed some issues with alert window notifications"
2017-03-02 01:04:56 +00:00
TreeHugger Robot
3f80513733
Merge changes Ic4370fa8,I81c43329,Ic563a8fe,I6d4be770,I858d1c95, ...
...
* changes:
Fixed a bug where a wrong notification could be visible
Fixed a bug where the icon would dissappear
Continued low-priority group implementation
Fixed an issue where the minimum height wasn't applied correctly
Worked around a bug where the view could render blank
Fixed another memory leak
Creating the right views for low-priority group children
Move the inflation away from the statusbar
2017-03-02 00:52:52 +00:00
George Mount
f05db56f24
Fix NPE when combining pop with add transaction.
...
Bug 35832085
When pop transactions and an add transaction are acting
in the same frame, optimized tranactions can work properly,
but unoptimized transactions have no guarantees. This fixes
a crash with unoptimized transactions so they will at least
not break.
Test: I996f54ae2540f31134e6a9a28870826a73ea1610
Change-Id: I3890dd30e9aff70f4ac142773de8479f1a9dffc8
2017-03-01 16:51:21 -08:00
Bryce Lee
bb983d28cd
Merge "Clear associated task when starting activity in a new task."
2017-03-02 00:48:29 +00:00
David Christie
31a1655191
Create PackageManager.isInstantApp API to query whether
...
a given package name is an instant app.
Test: refactor existing codepaths retained
Change-Id: I6253fe8cc398d6547566d11043bffd1c4ffaa74a
2017-03-01 16:36:48 -08:00
Garfield Tan
63cea4eefb
Merge "Remove DocumentsContract.ACTION_BROWSE."
2017-03-02 00:35:58 +00:00
Paul Stewart
b26979f14e
Merge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19
...
am: 5e10f3d8e3
2017-03-02 00:27:33 +00:00
Paul Stewart
5e10f3d8e3
Merge "Fix up EAP-SIM documentation" am: 2142b14a88
...
am: 32655dfa19
2017-03-02 00:22:25 +00:00
Bryce Lee
6d41026f1b
Clean up closing apps list when clearing anAppWindowToken's task.
...
Previously it was possible for an AppWindowToken to be removed while
on the closing apps list, used in transition animations. During these
transitions, the visibility of the token is modified. Since
visibility relies on the WindowContainer parent, a
NullPointerException would occur.
This changelist addresses the issue by making sure to remove any
AppWindowToken from this list when its task is set to null.
Change-Id: Id9234822b228f4658f04d42ac0fe7b49ded6f5a1
Fixes: 35352214
Test: manual (primarily code inspection)
2017-03-01 16:16:34 -08:00
Paul Stewart
32655dfa19
Merge "Fix up EAP-SIM documentation"
...
am: 2142b14a88
2017-03-02 00:12:43 +00:00
Fyodor Kupolov
fa0edc8c51
Log user running states
...
Test: manual
Bug: 28278870
Change-Id: I6ce20167e98eb44c838a681471095d00c4a6346d
2017-03-01 16:07:07 -08:00
Treehugger Robot
2142b14a88
Merge "Fix up EAP-SIM documentation"
2017-03-02 00:01:33 +00:00
Android Build Merger (Role)
43d059bf48
Merge "Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653 am: 0c4cace2a0 -s ours"
2017-03-01 23:59:18 +00:00
Tim Zhang
d2dc222827
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653
...
am: 0c4cace2a0
2017-03-01 23:58:32 +00:00
Bryce Lee
f1d8cb26af
Merge "Revert "Remove activity from task if not set properly.""
2017-03-01 23:58:17 +00:00
Yifan Hong
0c3b6b3eec
Merge "getTransport checks interface and instance names." am: 7f0300f1e2 am: 7719c1ad0d
...
am: cf4bd05edd
2017-03-01 23:46:09 +00:00
Bryce Lee
98689f751d
Revert "Remove activity from task if not set properly."
...
This reverts commit 0f9bde84a1
2017-03-01 23:44:43 +00:00
Tyler Gunn
bf8d2a2bf4
Merge "Support for showing self-managed calls in IncallService." am: 5a33057092 am: 8c7d28f163
...
am: fd0e1a9d93
2017-03-01 23:40:53 +00:00
nharold
d03ccf89bf
Merge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3 am: 1f7f262920
...
am: 3243ec0614
2017-03-01 23:38:30 +00:00
TreeHugger Robot
fa18d7cd71
Merge "Remove SystemApi from android.permission.REQUEST_NETWORK_SCORES."
2017-03-01 23:34:39 +00:00
Tim Zhang
0c4cace2a0
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a
...
am: 07acbea653
2017-03-01 23:32:07 +00:00
Tim Zhang
07acbea653
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."
...
am: 4904e7ae2a
2017-03-01 23:23:24 +00:00
