Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
421,113 Commits 3 Branches 0 Tags
b1794de32b0bfde8640974a04155f583b8c3d5d4
Commit Graph

421113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
b1794de32b Merge "Removing logs from old bug" into qt-dev 
am: 4410d23560

Change-Id: I1436ee10f53fc6d34412389d21a67d01afac3f09
 2019-05-31 10:40:22 -07:00
Christopher Tate
f9c9ab4540 Merge "Prevent double teardown of service connections" into qt-dev 
am: ae76af46b2

Change-Id: If1c2545572c07a72c930fd63b216b8c26bdf2615
 2019-05-31 10:36:00 -07:00
Julia Reynolds
02ad3486d1 Merge "Lower max concurrent notifications from an app" into qt-dev 
am: 9c11745528

Change-Id: I25169569572aec9da46936cdf0354c69f5472b6a
 2019-05-31 10:34:12 -07:00
Winson Chung
4410d23560 Merge "Removing logs from old bug" into qt-dev 2019-05-31 17:33:24 +00:00
TreeHugger Robot
ae76af46b2 Merge "Prevent double teardown of service connections" into qt-dev 2019-05-31 17:27:34 +00:00
Julia Reynolds
9c11745528 Merge "Lower max concurrent notifications from an app" into qt-dev 2019-05-31 17:13:44 +00:00
Evan Laird
14c2b63862 Merge "Fix always-null children on NotificationEntry" into qt-dev 
am: ab6d2d3152

Change-Id: Ic5232a43230dc1e464fe85b68dbb902e5b1b504a
 2019-05-31 10:09:00 -07:00
TreeHugger Robot
ab6d2d3152 Merge "Fix always-null children on NotificationEntry" into qt-dev 2019-05-31 17:03:05 +00:00
Kweku Adams
60c691162c Merge "Marking job deferral time in QuotaController." into qt-dev 
am: f2079ee257

Change-Id: I7d6ef60cdf3b372a4052dde78af28d6a0aaf2a55
 2019-05-31 09:57:04 -07:00
TreeHugger Robot
f2079ee257 Merge "Marking job deferral time in QuotaController." into qt-dev 2019-05-31 16:44:23 +00:00
Baligh Uddin
b29c6ee9c6 Merge "Add OWNERS file to block further submits so we can start migration." into qt-dev 
am: 5d35b50398

Change-Id: If65cca841b5901ceb48f6dd5c91a02fb552260d5
 2019-05-31 09:38:51 -07:00
Baligh Uddin
5d35b50398 Merge "Add OWNERS file to block further submits so we can start migration." into qt-dev 2019-05-31 16:33:59 +00:00
Zimuzo Ezeozue
9b05627270 Merge "Pause watchdog triggering on the main thread during OtaDexoptService" into qt-dev 
am: fb9843f8d7

Change-Id: I362fe849a75ebeedc40257745b7e4069f12324bd
 2019-05-31 09:29:47 -07:00
Gavin Corkery
9b87b9a6dd Merge "Perform user data back up in post install stage" into qt-dev 
am: 5b9e00273b

Change-Id: I7b45401aeaf34855921f25a2c00c9af1a1a25035
 2019-05-31 09:18:06 -07:00
Beth Thibodeau
2ae65293ed Merge "Add text shadow to improve visibility on album art" into qt-dev 
am: ab160487d6

Change-Id: I3238f15d4709e72b459aa356a731c39e50a71f63
 2019-05-31 09:14:56 -07:00
Zimuzo Ezeozue
fb9843f8d7 Merge "Pause watchdog triggering on the main thread during OtaDexoptService" into qt-dev 2019-05-31 16:14:17 +00:00
Gavin Corkery
5b9e00273b Merge "Perform user data back up in post install stage" into qt-dev 2019-05-31 16:10:13 +00:00
TreeHugger Robot
ab160487d6 Merge "Add text shadow to improve visibility on album art" into qt-dev 2019-05-31 16:02:40 +00:00
Lorenzo Colitti
c96a804145 [automerger skipped] Merge changes Ib9a15fec,I9f3f2588 into qt-dev 
am: f4a435aca0 -s ours
am skip reason: change_id Ib9a15fececd8579fc5b139fe0341275a45512e0f with SHA1 ac955b3171 is in history

Change-Id: I2aa4637ae7a48afbf7b4ad953837762262bd94b8
 2019-05-31 08:58:13 -07:00
Heemin Seog
794f5ac17e Merge "Send data warning intents with the current user" into qt-dev 
am: f1f6146ed8

Change-Id: I49a23390164319ac67126a31642805e93c355403
 2019-05-31 08:54:25 -07:00
Lorenzo Colitti
f4a435aca0 Merge changes Ib9a15fec,I9f3f2588 into qt-dev 
* changes:
  Don't crash ConnectivityService if the network stack crashes.
  Add a wrapper for INetworkMonitor.
 2019-05-31 15:45:49 +00:00
Heemin Seog
f1f6146ed8 Merge "Send data warning intents with the current user" into qt-dev 2019-05-31 15:44:18 +00:00
Keun young Park
1c3efbc440 Merge "ColorDisplayService: Check for null content observer before unregistering" into qt-dev 
am: 36d2b17108

Change-Id: I29cba386e8599f27b482dcffe69a5f39ea1df46c
 2019-05-31 08:42:49 -07:00
TreeHugger Robot
36d2b17108 Merge "ColorDisplayService: Check for null content observer before unregistering" into qt-dev 2019-05-31 15:33:32 +00:00
Santos Cordon
e174d31609 Merge "Adding some brightness logging." into qt-dev 
am: 9b26440e86

Change-Id: I5bfcddbe4b658ae3962f54194ff8d9d3931494b7
 2019-05-31 08:00:39 -07:00
Lucas Dupin
cf02743de1 Merge "Do not translate statusbar icons" into qt-dev 
am: 47e4102e9f

Change-Id: Ib4d9291229c735af19e53cee5e1ebe4fd2667030
 2019-05-31 07:58:44 -07:00
Santos Cordon
9b26440e86 Merge "Adding some brightness logging." into qt-dev 2019-05-31 14:56:41 +00:00
Fabian Kozynski
69b2cdd42e Merge "Clear AppOpsController when it stops listening" into qt-dev 
am: a8723416cc

Change-Id: Ibcc515654854d67bb2a8bda598edc41b0c0d9bf4
 2019-05-31 07:55:03 -07:00
Remi NGUYEN VAN
7086666dea Merge "Simplify crash conditions in NetworkStackClient" into qt-dev 
am: e7e0294294

Change-Id: I423ca6ebb328f49b170baae0da9b8409a6429fcb
 2019-05-31 07:52:52 -07:00
Lucas Dupin
47e4102e9f Merge "Do not translate statusbar icons" into qt-dev 2019-05-31 14:52:07 +00:00
Fabian Kozynski
1676296c21 Merge "Remove leftover stopship comment line" into qt-dev 
am: c40cff352a

Change-Id: I156acd83b6f87148240e9de617f281097ec41017
 2019-05-31 07:46:07 -07:00
TreeHugger Robot
a8723416cc Merge "Clear AppOpsController when it stops listening" into qt-dev 2019-05-31 14:44:10 +00:00
Aran Ink
f9e7681f15 Merge "Change GlobalActions emergency icon to star of life." into qt-dev 
am: 2f86e74333

Change-Id: I51f009bf3b02e52c8da92d73fa6b803cec34c206
 2019-05-31 07:43:21 -07:00
Remi NGUYEN VAN
e7e0294294 Merge "Simplify crash conditions in NetworkStackClient" into qt-dev 2019-05-31 14:42:08 +00:00
David Sehr
f47b38277a Merge "Add system option to disable lock profiling" am: b1ec00b5ea 
am: f7da2c5812

Change-Id: I6e9c783a346d181fef7446beedf324de1e40daae
 2019-05-31 07:37:52 -07:00
Fabian Kozynski
c40cff352a Merge "Remove leftover stopship comment line" into qt-dev 2019-05-31 14:33:54 +00:00
Aran Ink
2f86e74333 Merge "Change GlobalActions emergency icon to star of life." into qt-dev 2019-05-31 14:32:01 +00:00
Aran Ink
50195263b7 Change GlobalActions emergency icon to star of life. 
Also fixes spacing for landscape/seascape layout spacing in column view.

Test: Manual inspection.
Fixes: 133435027

Change-Id: Ia3eee8747847ee2a74c2014263545dfdf14f52ce
 2019-05-31 14:31:07 +00:00
David Sehr
f7da2c5812 Merge "Add system option to disable lock profiling" 
am: b1ec00b5ea

Change-Id: Ic7f4b3397d497cfa7c29c9497c047e6eb3d71364
 2019-05-31 07:29:00 -07:00
David Sehr
b1ec00b5ea Merge "Add system option to disable lock profiling" 2019-05-31 14:23:12 +00:00
Lorenzo Colitti
38846fcb45 Merge "Don't crash ConnectivityService if the network stack crashes." am: 55d1b0500a 
am: ac29a97d10

Change-Id: Idae97f7dc29fd95ede722fe34dc20b941002a41c
 2019-05-31 07:22:43 -07:00
Lorenzo Colitti
f331108f5a Don't crash ConnectivityService if the network stack crashes. 
When the network stack crashes, the system will rebind to it.
Existing references are no longer useful (they just throw
RemoteException) but if the system is still up, then the user
can at least recover the situation by taking actions such as
going into airplane mode, toggling wifi, etc.

This CL stops ConnectivityService from crashing the system when
it cannot talk to NetworkMonitor. This is arguably better than
crashing the system, because crashing the system is disruptive
and carries the serious risk of a bootloop from which it is not
possible to recover.

NetworkStackClient already contains code to crash the system
when the network stack crashes. This change help ensure that
if a crash occurs, it is the result of an explicit decision by
that code instead of an unchecked exception in one of the callers
of the network stack.

Bug: 133725814
Test: builds, boots
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ib9a15fececd8579fc5b139fe0341275a45512e0f
Merged-In: Ib9a15fececd8579fc5b139fe0341275a45512e0f
(cherry picked from commit ac29a97d10)
 2019-05-31 14:19:36 +00:00
Lorenzo Colitti
ac29a97d10 Merge "Don't crash ConnectivityService if the network stack crashes." 
am: 55d1b0500a

Change-Id: I1ee83023ad0cf12c980daf730926fadd82699c3b
 2019-05-31 07:17:35 -07:00
Lorenzo Colitti
1cf53ba8e6 Add a wrapper for INetworkMonitor. 
Generated using:
./wrap_aidl.sh frameworks/base/services/net/aidl/networkstack/3/android/net/INetworkMonitor.aidl > frameworks/base/services/net/java/android/net/NetworkMonitorManager.java

Bug: 133725814
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I9f3f2588d498a05e2405129cf58bfcdd30f45e3b
Merged-In: I9f3f2588d498a05e2405129cf58bfcdd30f45e3b
(cherry picked from commit 64877b6509)
 2019-05-31 13:58:59 +00:00
Lorenzo Colitti
55d1b0500a Merge "Don't crash ConnectivityService if the network stack crashes." 2019-05-31 13:58:00 +00:00
Lorenzo Colitti
64877b6509 Merge "Add a wrapper for INetworkMonitor." am: 878a3dd49d 
am: 3346abba4b

Change-Id: I00210d9b3c42df0069c2649a429d1c8eeec7ba57
 2019-05-31 06:47:37 -07:00
Lorenzo Colitti
3346abba4b Merge "Add a wrapper for INetworkMonitor." 
am: 878a3dd49d

Change-Id: I09cce00f2735b16b8d2b3af5ead7f2df8c999d7b
 2019-05-31 06:42:54 -07:00
Lorenzo Colitti
878a3dd49d Merge "Add a wrapper for INetworkMonitor." 2019-05-31 13:25:36 +00:00
Julia Reynolds
3e9bd48fea Lower max concurrent notifications from an app 
Test: boot device
Fixes: 134072958
Change-Id: I083f2c0d034b0429a26abd93286dc2c8fcf59f26
 2019-05-31 09:19:15 -04:00
Fabian Kozynski
4a7331f845 Remove leftover stopship comment line 
Test: none
Fixes: 129405675
Change-Id: I95e74cd50cccf81879e0fcb5321d4b1656efdd1c
 2019-05-31 09:04:59 -04:00