Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
447,511 Commits 3 Branches 0 Tags
e054e6becd7bca424a6e3bcff91a27c7ea2d3180
Commit Graph

97946 Commits

Author SHA1 Message Date
Nikita Ioffe
e054e6becd Merge "Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl()" am: d8f9951f21 am: a3fd43040b 
Change-Id: I4d8a505fb215e45a318e8222f924aa29a6ab5dea
 2020-04-09 18:52:24 +00:00
Nikita Ioffe
a3fd43040b Merge "Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl()" am: d8f9951f21 
Change-Id: I35e5111b5db8be175c85032a90c82336ff9373be
 2020-04-09 18:28:37 +00:00
Nikita Ioffe
cca499411f Introduce static @hide PowerManager.isRebootingUserspaceSupportedImpl() 
This method consolidates logic of testing whenever rebooting userspace
is supported in a place that can be used both from
PowerMager.isRebootingUserspaceSupported() API and from
PowerManagerService.reboot() implementation.

Consequently, this makes `adb shell svc power reboot userspace` also
benefit from that check, and fail userspace reboot on devices that don't
support it.

Also tweaked logic of ignoring RemoteException to take into account
userspace reboot.

Test: adb root
Test: adb shell setprop init.userspace_reboot.is_supported 0
Test: adb shell svc power reboot userspace & verified error message
Test: adb shell setprop init.userspace_reboot.is_supported 1
Test: adb shell svc power reboot userspace & verified no error message
Test: atest PowerManagerTest
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152803929
Change-Id: I2d3a8e0ae1320c408a838c5c5fdf4cd977b167b3
Merged-In: I2d3a8e0ae1320c408a838c5c5fdf4cd977b167b3
(cherry picked from commit 57300d9057)
 2020-04-09 17:56:25 +01:00
Xin Li
9fd000bfec Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
Xiangyu/Malcolm Chen
1ca9eb6367 Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." am: beccb937dd am: d27d90453d 
Change-Id: If0bf8398039991c4242a1d2a1aa5e7cb43dae811
 2020-04-08 00:19:02 +00:00
Xiangyu/Malcolm Chen
d27d90453d Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." am: beccb937dd 
Change-Id: I0a7420ff72fc27d14ac8ba88f5839a7a28e092b2
 2020-04-08 00:05:14 +00:00
Xiangyu/Malcolm Chen
beccb937dd Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." 2020-04-07 23:45:00 +00:00
Xin Li
ab1261dddc DO NOT MERGE - Merge QQ2A.200405.005 into master 
Bug: 150877681
Change-Id: Iacdd23c38aef7ff04c5d289720318d41cbf18158
Merged-In: I9265f01ed2f6e4aca7728d278f06ceea5633dac5
 2020-04-07 15:13:00 -07:00
Treehugger Robot
3e33a9cb60 Merge "Fix a stupid NPE" am: 72746119bc am: 77ccd8d055 
Change-Id: Ic3b10be1bec50271470dfedfa8cb7f8e5ab8f821
 2020-04-07 06:19:00 +00:00
Treehugger Robot
77ccd8d055 Merge "Fix a stupid NPE" am: 72746119bc 
Change-Id: I3a167339e4007e5cb16488e701b9ca16937da265
 2020-04-07 06:02:50 +00:00
Treehugger Robot
72746119bc Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00:00
Chalard Jean
19ba0bbf1b Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb am: a5f7fcacbe 
Change-Id: Ifa0b2239ccd0c09708085ee68c39454e1eceeffe
 2020-04-06 06:34:58 +00:00
Chalard Jean
a5f7fcacbe Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb 
Change-Id: Ia0a2afe359cac6adfd33d2f839eddb8bd14b5f43
 2020-04-06 06:17:46 +00:00
Chalard Jean
67370a01cb Merge "Fix a bug where the legacy extra info is reset on connect." 2020-04-06 06:04:46 +00:00
Chalard Jean
90ef10894c Fix a bug where the legacy extra info is reset on connect. 
Bug: 149459996
Test: NetworkAgentTest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I5f8f6d962ee3317e101d19518c767b3c327c0c47
 2020-04-06 12:46:19 +09:00
Treehugger Robot
36bc96226c Merge "Include exception as cause of BadParcelableException" am: 9b88b3732d am: 2238c3f118 
Change-Id: Ib81b9075c10a3b827e1973833f8bfc0fa0bf887c
 2020-04-03 19:17:37 +00:00
Treehugger Robot
2238c3f118 Merge "Include exception as cause of BadParcelableException" am: 9b88b3732d 
Change-Id: I2e79f0c5cef6aab068e290c5682847142c9eb939
 2020-04-03 18:51:21 +00:00
Treehugger Robot
9b88b3732d Merge "Include exception as cause of BadParcelableException" 2020-04-03 18:37:25 +00:00
Eugene Susla
86456adf11 Merge "Prevent HandlerThread from losing interrupted flag" am: f86d2fb44d am: 9cdea35a61 
Change-Id: I4c8044dffa89d2484e1a6b67b0d0ef43eaab514d
 2020-04-03 17:40:13 +00:00
Eugene Susla
9cdea35a61 Merge "Prevent HandlerThread from losing interrupted flag" am: f86d2fb44d 
Change-Id: I8277cd9ce4a5ad03228ed8f351acd3d0e7892fdc
 2020-04-03 17:14:40 +00:00
Eugene Susla
f86d2fb44d Merge "Prevent HandlerThread from losing interrupted flag" 2020-04-03 16:58:18 +00:00
Chalard Jean
1c48f85a21 Fix a stupid NPE 
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I3e17211c03bc74426bf5e2e414ec322d73b0060b
 2020-04-03 07:17:13 +09:00
Charles Munger
368949c23a Include exception as cause of BadParcelableException 
Bug: 136208613
Test: Improved error message
Change-Id: I31404ef67f3b3c8788bd5b83ac5db94279f50f7c
 2020-04-02 20:25:22 +00:00
Linus Tufvesson
61f4581858 RESTRICT AUTOMERGE 
Revert submission 10383599-type-presentation-q

Reason for revert: Breaks apps using Presentation in combination with private virtual displays
Reverted Changes:
I2aaab1903:RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...
Ib5a24f8be:RESTRICT AUTOMERGE Add test for Presentation

Bug: 141745510
Bug: 152342138

Merged-In: I0b3a332c286900952b65ece12435f981e324cb5b
Change-Id: I0b3a332c286900952b65ece12435f981e324cb5b
(cherry picked from commit a9211d687d)
 2020-04-02 14:32:31 +00:00
Linus Tufvesson
e545107276 RESTRICT AUTOMERGE am: a9211d687d am: 8f258aaee1 
Change-Id: I694d17a4907bc29f34a705ab1201b8b6330fb480
 2020-04-02 14:11:14 +00:00
Linus Tufvesson
8f258aaee1 RESTRICT AUTOMERGE am: a9211d687d 
Change-Id: I48884c93a30f03f0803ebfe939c2b5cedad70321
 2020-04-02 13:47:14 +00:00
Chalard Jean
579665d652 Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 90c292b13e am: 3dcfc3e5c6 
Change-Id: I237ed648bf6f8533e6c8e79dc44a8240c0e32e7a
 2020-04-02 06:38:02 +00:00
Chalard Jean
e49cc246e8 Address further API council comments. am: 47ce6894cc am: 150ebad774 
Change-Id: I8c9fa0413e3c62180eae20951e559b69e53ea049
 2020-04-02 06:37:56 +00:00
Chalard Jean
3dcfc3e5c6 Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 90c292b13e 
Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
 2020-04-02 06:15:02 +00:00
Chalard Jean
150ebad774 Address further API council comments. am: 47ce6894cc 
Change-Id: I237fc6a82df362d5463e8e518967de28735bf2da
 2020-04-02 06:14:55 +00:00
Chalard Jean
90c292b13e Merge changes from topics "api-fix-networkagent", "satisfiedby" 
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
 2020-04-02 05:51:02 +00:00
Lorenzo Colitti
d4b0fe443a Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d am: 7adae30ac0 
Change-Id: I76fd2c58d688ea45f9b30e9efd24235bea2eadf9
 2020-04-02 04:51:36 +00:00
Lorenzo Colitti
7adae30ac0 Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d 
Change-Id: I5267b567e1b9babe3bc95d2984262dc864681a2d
 2020-04-02 04:32:04 +00:00
Lorenzo Colitti
4fa9742c4d Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
junyulai
1062423d8b [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 am: 7bb7d94d39 
Change-Id: I99eef67c05afb7d6432d5dbf32494d2f5b56b1a5
 2020-04-02 02:41:00 +00:00
junyulai
7bb7d94d39 [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
 2020-04-02 02:21:20 +00:00
Junyu Lai
6baf734a9b Merge changes from topic "sp26-networkstats-cts" 
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
 2020-04-02 02:00:59 +00:00
Malcolm Chen
1cae35384b Hide APIs exposed for Telephony mainline which is no longer needed in R. 
The APIs were added in b/144351078, b/148097978 and b/148116922.
b/151665796 is used to revert them.

Bug: 151665796
Bug: 144351078
Bug: 148097978
Bug: 148116922
Test: build
Change-Id: I08db8c5c0161747a7e775a8de0daa7077b513f10
Merged-In: I08db8c5c0161747a7e775a8de0daa7077b513f10
 2020-04-01 12:46:51 -07:00
Fredrik Roubert
05be5a58e5 Merge "Add "ftp" to the list of URL schemes that get linkified." am: cc7a0e7152 am: d13a70de57 
Change-Id: I21172f168aa254b6a8c50cc4c79776f8a8a67fbc
 2020-04-01 19:22:06 +00:00
Fredrik Roubert
d13a70de57 Merge "Add "ftp" to the list of URL schemes that get linkified." am: cc7a0e7152 
Change-Id: I08418b82a81bc153061544ff09afb19daec9125d
 2020-04-01 19:21:13 +00:00
Steven Moreland
915dd29eb9 Merge "Document linkToDeath behavior on object cleanup." am: 2608950d10 am: f276d0b74d 
Change-Id: I524ed2cb3f795a04ae5cac2f039ebb41cebb30f7
 2020-04-01 19:21:13 +00:00
Fredrik Roubert
cc7a0e7152 Merge "Add "ftp" to the list of URL schemes that get linkified." 2020-04-01 19:02:51 +00:00
Steven Moreland
f276d0b74d Merge "Document linkToDeath behavior on object cleanup." am: 2608950d10 
Change-Id: I3c8a4f9f4da3aff87fa1f1e1fff0e016f1ec4cad
 2020-04-01 18:57:19 +00:00
Steven Moreland
2608950d10 Merge "Document linkToDeath behavior on object cleanup." 2020-04-01 18:35:05 +00:00
Nikita Ioffe
149e8531da Merge "Make init.userspace_reboot.is_supported a rw property" am: 67ee6aeb9e am: ece1219eb9 
Change-Id: I3b301c6f994007eb30210005c62ce52ce0ea16fc
 2020-04-01 13:52:32 +00:00
Mohammad Samiul Islam
b48e5218ca Prevent staging multiple sessions on devices not supporting checkpoint am: 8c7142a658 am: aa0cebd8a4 
Change-Id: I0df73dbd59ab220044a3369ceb9803944354be58
 2020-04-01 13:51:59 +00:00
Nikita Ioffe
ece1219eb9 Merge "Make init.userspace_reboot.is_supported a rw property" am: 67ee6aeb9e 
Change-Id: I4ee415f6ee67ad88e6035fae5d7850e0933c1dd6
 2020-04-01 13:32:15 +00:00
Mohammad Samiul Islam
aa0cebd8a4 Prevent staging multiple sessions on devices not supporting checkpoint am: 8c7142a658 
Change-Id: I42c180ae216777624b4ad204466f0f64fccecbb9
 2020-04-01 13:31:05 +00:00
Nikita Ioffe
67ee6aeb9e Merge "Make init.userspace_reboot.is_supported a rw property" 2020-04-01 13:14:22 +00:00
Mohammad Islam
cf2865a167 Merge changes from topics "abort-individual-session", "apk-checkpoint", "rebrand-to-revert", "supportsCheckPoint" 
* changes:
  Enable filesystem checkpoint for staged apk installation
  Allow staging multiple sessions with non-overlapping packages (apk+apex)
  Replace abortActiveSession in StagingManager with revertActiveSessions
  Allow StagingManager to abort individual staged session
  Prevent staging multiple sessions on devices not supporting checkpoint
  Rebrand the term "rollback" to "revert" for apexd
 2020-04-01 13:05:58 +00:00