Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
404,750 Commits 3 Branches 0 Tags
b00141908448dd4444e2702e9f84ea774fb15de2
Commit Graph

404750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hongshik
b001419084 Merge "Add "close" socket option for immediately close socket after finish check captive portal." am: 5751278992 am: b697d85c60 
am: 488c2a0f6c

Change-Id: I2105a8a26bc99469f45e7e3b0f8e2ba508d75752
 2019-02-13 21:55:25 -08:00
TreeHugger Robot
e68e639954 Merge "WifiInfo: Fix javadocs to reflect the new behavior" 2019-02-14 05:48:33 +00:00
Remi NGUYEN VAN
d085587d7c Merge "Fix flaky testNattSocketKeepalives" am: 16758070d0 am: def37aef89 
am: 0ed6920494

Change-Id: Ibfdd4dddb8dad9ee26f9f1ec175ca87bc46ce761
 2019-02-13 21:45:39 -08:00
Shuo Qian
1d03680645 [automerger skipped] Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" am: 6cc4c0c029 am: feee99e594 
am: f3d7a41dd1 -s ours
am skip reason: change_id Ica15965cb904b758e078b8439e5e9d3f39b9c0a2 with SHA1 04e94fcb0a is in history

Change-Id: If01773b3cf51fad385a02ab9e769478ca5adec4c
 2019-02-13 21:38:30 -08:00
Hongshik
488c2a0f6c Merge "Add "close" socket option for immediately close socket after finish check captive portal." am: 5751278992 
am: b697d85c60

Change-Id: Id7f0198771a3da31b577e64da2816bc61c2e04cd
 2019-02-13 21:32:48 -08:00
Android Build Merger (Role)
596f6a18a9 Merge "Merge "Add build rule of data stall proto" am: f9727b43cb am: 6964f58149 am: fe42888761" 2019-02-14 05:28:38 +00:00
Chiachang Wang
06232688f2 Merge "Add build rule of data stall proto" am: f9727b43cb am: 6964f58149 
am: fe42888761

Change-Id: I54d059d23ef628b338a5b406ddcf73477984e6e8
 2019-02-13 21:28:03 -08:00
TreeHugger Robot
e4579c9fb2 Merge "[Game Driver] Add global whitelist option." 2019-02-14 05:25:35 +00:00
Remi NGUYEN VAN
0ed6920494 Merge "Fix flaky testNattSocketKeepalives" am: 16758070d0 
am: def37aef89

Change-Id: I20ec043e5caeb61c4e31f087a10deb2dc13c0d95
 2019-02-13 21:24:35 -08:00
Lucas Lin
d9e0786fc1 Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a am: deac15fa83 
am: 238ddb629d

Change-Id: I2ef6009364bd1420c915df003e2ff5c3857ef3e7
 2019-02-13 21:20:09 -08:00
Shuo Qian
f3d7a41dd1 Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" am: 6cc4c0c029 
am: feee99e594

Change-Id: Ib3fb3ef69b98879badb26a02570e2089aee2df12
 2019-02-13 21:14:35 -08:00
Chiachang Wang
fe42888761 Merge "Add build rule of data stall proto" am: f9727b43cb 
am: 6964f58149

Change-Id: I5151f3abf2556a53c437a7998b0a5d093e69afaf
 2019-02-13 21:09:22 -08:00
Hongshik
b697d85c60 Merge "Add "close" socket option for immediately close socket after finish check captive portal." 
am: 5751278992

Change-Id: Ifae5a6889fc20bcd7f4269205c33e3e7fa6bd8f0
 2019-02-13 21:08:32 -08:00
Sehee Park
05141df15a Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf am: 7042e290cf 
am: f27ea45a90

Change-Id: Ie07ab945aa6a5c997f776f237f757c533cc1d453
 2019-02-13 21:08:16 -08:00
Lucas Lin
238ddb629d Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a 
am: deac15fa83

Change-Id: I441a37682e11aa349301750c26545c5c0f1a274a
 2019-02-13 21:04:01 -08:00
Sehee Park
f27ea45a90 Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf 
am: 7042e290cf

Change-Id: I8f46698b23118213019226e4b9d5e6b196b010d3
 2019-02-13 20:57:13 -08:00
Treehugger Robot
5751278992 Merge "Add "close" socket option for immediately close socket after finish check captive portal." 2019-02-14 04:55:21 +00:00
Remi NGUYEN VAN
def37aef89 Merge "Fix flaky testNattSocketKeepalives" 
am: 16758070d0

Change-Id: Ie9fe40e3bcf4187a2e5cbf525bc4e874cff70747
 2019-02-13 20:42:01 -08:00
Shuo Qian
feee99e594 Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" 
am: 6cc4c0c029

Change-Id: I17375b97d6c695f810ea23d6682bb598c5a55b35
 2019-02-13 20:38:03 -08:00
Chiachang Wang
6964f58149 Merge "Add build rule of data stall proto" 
am: f9727b43cb

Change-Id: I0ec765ab554fb83bcaad5abb8131bb56d39401b7
 2019-02-13 20:33:46 -08:00
Lucas Lin
deac15fa83 Merge "Clear all lingering notifications when network is disconnected" 
am: 1037bbb82a

Change-Id: I2d9f84840cdc73ed3b30278d7a9dbeefff233fa3
 2019-02-13 20:29:03 -08:00
Sehee Park
7042e290cf Merge "Enable DOM storage API for CaptivePortalLoginActivity" 
am: f7150486bf

Change-Id: Ie6e99f0c8ddeb28086197b291c198fa115f6e157
 2019-02-13 20:21:56 -08:00
TreeHugger Robot
ef50734c58 Merge "Fine tune background shape for app entity" 2019-02-14 03:47:45 +00:00
Remi NGUYEN VAN
16758070d0 Merge "Fix flaky testNattSocketKeepalives" 2019-02-14 03:29:00 +00:00
Remi NGUYEN VAN
ac02bc8141 Fix flaky testNattSocketKeepalives 
The test did not wait for the WifiNetworkAgent to disconnect, and there
are reports of flakes where it is still connected in
connectKeepaliveNetwork.

Test: atest FrameworksNetTests
Bug: 124319553
Change-Id: I85968806885c8853ec4f4dbea356366c1af0ea1c
 2019-02-14 03:28:48 +00:00
Remi NGUYEN VAN
55b0803ae1 Merge "Remove deps from framework on netd interfaces" 2019-02-14 03:11:32 +00:00
Shuo Qian
6cc4c0c029 Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" 2019-02-14 02:59:09 +00:00
Chiachang Wang
f9727b43cb Merge "Add build rule of data stall proto" 2019-02-14 02:57:38 +00:00
Chiachang Wang
8daede9700 Add build rule of data stall proto 
Bug: 121185319
Bug: 120452078
Test: Build and test against data stall code
Change-Id: I3b243ab947464a431ef205c5f2f30edc883e2963
 2019-02-14 10:55:03 +08:00
Peiyong Lin
b76bfe95e9 [Game Driver] Add global whitelist option. 
Allow a '*' at the beginning of the whitelist file to mean whitelist
everything.

BUG: 120869311
Test: Build, flash and boot. Verify with apk
Change-Id: Ia1b772f545a04acb7f5b4ccbe5489e43ecddb9d2
 2019-02-13 18:52:35 -08:00
TreeHugger Robot
e3e53162cb Merge "Fix Autofill PartitionedActivityTest fail." 2019-02-14 02:38:39 +00:00
TreeHugger Robot
c71e31c102 Merge "Tint the footer info icon." 2019-02-14 02:31:31 +00:00
Lucas Dupin
56be3038ae Merge "Only wake to lock screen if AOD is on" 2019-02-14 02:18:57 +00:00
TreeHugger Robot
7fff242e06 Merge "Update notification layouts when overlays change." 2019-02-14 02:17:36 +00:00
Selim Cinek
0470975933 Merge "Add StatusBarStateController to DependencyBinder" 2019-02-14 02:11:45 +00:00
TreeHugger Robot
99370a2f3e Merge "MediaController2: Revisit Javadoc of onPlaybackActiveChanged" 2019-02-14 02:00:45 +00:00
Jordan Liu
059be19445 [automerger skipped] Merge "Add UNINITIALIZED and rename INVALID" am: b8493ac5eb am: aa20ef0836 
am: 7a39287ca0 -s ours
am skip reason: change_id Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df with SHA1 cb47d1dcc7 is in history

Change-Id: I9e8250e2bdb4a7f5ce46f43ab25281c62c37e911
 2019-02-13 17:58:48 -08:00
Hongshik
1da51fcdc4 Add "close" socket option for immediately close socket after finish check captive portal. 
Unexpected packets are observed after captive portal check. Due to the packets, modem can't fall-back to idle state (modem remained as active state).
It makes unnecessary power consumtion.
To prevent it, "close" option is added in sendHttpProbe()

Test: check socket close.
Change-Id: I5b6987071ad915081846504adbb209eb371fd1c3
 2019-02-14 10:51:51 +09:00
Shuo Qian
ce1826b2ed Merge "Populate 'hasKnownUserIntentEmergency'" 2019-02-14 01:44:36 +00:00
Lucas Lin
1037bbb82a Merge "Clear all lingering notifications when network is disconnected" 2019-02-14 01:40:47 +00:00
TreeHugger Robot
53db04e494 Merge "Update WebView.loadData docs for Q targetSdk quirk." 2019-02-14 01:22:39 +00:00
Treehugger Robot
f7150486bf Merge "Enable DOM storage API for CaptivePortalLoginActivity" 2019-02-14 01:19:50 +00:00
Android Build Merger (Role)
561a5ce572 Merge "Merge "Implement more location checks" am: a3aae9fe4b am: 8b98155789 am: 74c000a5ba" 2019-02-14 01:19:23 +00:00
Hall Liu
8c63ea5b54 Merge "Implement more location checks" am: a3aae9fe4b am: 8b98155789 
am: 74c000a5ba

Change-Id: I3a75d4497453eb8284929e420f933332c792ef83
 2019-02-13 17:16:08 -08:00
TreeHugger Robot
4d1f54e33a Merge "Fix waitForBroadcastIdle()" 2019-02-14 01:15:35 +00:00
Jeff Sharkey
0e0d1c5968 Merge changes I4710a554,I28c8188b,Ia8d4b546 
* changes:
  Set MediaPlayer sources in more direct fashion.
  Grant ringtone picker the ability to see Music.
  Also include snapshot value in APK cache digest.
 2019-02-14 01:09:48 +00:00
sqian
a31ef445e9 Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId 
Test: Treehugger
Bug: 123927534
Change-Id: Ica15965cb904b758e078b8439e5e9d3f39b9c0a2
Merged-In: Ica15965cb904b758e078b8439e5e9d3f39b9c0a2
(cherry picked from commit 04e94fcb0a)
 2019-02-13 17:06:05 -08:00
TreeHugger Robot
a99c4f30ee Merge "Support showTouches on multi-display (2/2)" 2019-02-14 00:54:22 +00:00
Jordan Liu
7a39287ca0 Merge "Add UNINITIALIZED and rename INVALID" am: b8493ac5eb 
am: aa20ef0836

Change-Id: I2ad19b617f0165e7bcabac567463dfe8f4b175c6
 2019-02-13 16:52:32 -08:00
Shuo Qian
59f5a5ec94 Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId" 2019-02-14 00:51:19 +00:00