Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Lin
915d8441f8 Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev am: 50e8e64c45 -s ours 
am: 279845e54c  -s ours

Change-Id: If7728696791b206a62185b157206cd5376092198
 2016-12-13 01:58:48 +00:00
Ben Lin
65b4c7a996 DO NOT MERGE ANYWHERE am: 4c80659e99 -s ours 
am: 6f67f964c3  -s ours

Change-Id: I219054dfb871e09c8b788344737c2d2aa5adc99d
 2016-12-13 01:57:41 +00:00
Jeremy Joslin
280f82c312 Make the onRequestRecommendation() method async. 
Converted the NetworkRecommendationProvider.onRequestRecommendation()
method into an async call to give implementors more flexibility.

Added unit tests for NetworkRecommendationProvider.

Test: Added NetworkRecommendationProviderTest.
BUG: 32909424
Change-Id: I8c1d2e11baa539744d77a012e85351f750523e3b
Merged-In: Iebe72f260133e9ad1946b0b75e2f69635e154ef3
 2016-12-12 17:48:41 -08:00
sergeyv
9fbb0b5ab3 Prohibit Config.HARDWARE in factory methods, that create mutable bitmaps 
Test: android.cts.graphics.BitmapTest#testCreateMutableBitmapWithHardwareConfig
bug:30999911
Change-Id: I7cd4e2625563b6659613ccd180a57c56dcf7c2b1
 2016-12-12 17:46:59 -08:00
Ben Lin
279845e54c Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev 
am: 50e8e64c45  -s ours

Change-Id: I1ef606566d2c1dfbe6ff273e073a45b72a0d788f
 2016-12-13 01:46:11 +00:00
Ben Lin
6f67f964c3 DO NOT MERGE ANYWHERE 
am: 4c80659e99  -s ours

Change-Id: I1d5b79452fcca235e8026cab583040db69aff1e6
 2016-12-13 01:46:07 +00:00
TreeHugger Robot
fbb91c963e Merge "Only checking activity state to determine visibility when entering PiP." 2016-12-13 01:44:42 +00:00
TreeHugger Robot
0bb1f8919e Merge "Fixed window ordering issue with TYPE_VOICE_INTERACTION." 2016-12-13 01:38:54 +00:00
Ben Lin
50e8e64c45 Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev 2016-12-13 01:34:43 +00:00
TreeHugger Robot
03004291e1 Merge "Make the onRequestRecommendation() method async." 2016-12-13 01:34:25 +00:00
Hugo Benichi
97d10ffcad DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents 
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402

(cherry picked from commit e1c173d224)

Change-Id: Ibe41e9a76db36ea502697a5f19fc0d91c40a3087
 2016-12-13 10:20:03 +09:00
Hugo Benichi
ff0b58627f DO NOT MERGE IpConnectivityMetrics reads buffer size in settings 
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry pick from commit 05686dbb6b)

Change-Id: Ie7ca1638533479601c5983bb6e54705003561b6c
 2016-12-13 10:20:03 +09:00
Hugo Benichi
f6fdb4a552 DO NOT MERGE TokenBucket for rate-limiting and throttling 
This patch adds a TokenBucket class that can accumulate and distribute
tokens over time.

Test: comes with unit tests.
Bug: 32198637

(cherry picked from commit 998493f0ee)

Change-Id: Iaf477c7bb14f8ddb293b7a907e2ab0cf76d09e07
 2016-12-13 10:20:03 +09:00
Hugo Benichi
31cf55bdfe DO NOT MERGE IpConnectivity metrics: add version number 
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit d680d4c856)

Change-Id: I5f37633afd9ec82f5402c5b6670fe2febae82a14
 2016-12-13 10:19:13 +09:00
jackqdyulei
cbc1ab862a Add tint for edit and setting icon 
Bug: 32592245
Test: Manual
Change-Id: Ibed4eca205afce44d50440f56b77edadf9a47505
 2016-12-12 17:17:57 -08:00
Josh Gao
bf249c1357 Merge "Add trace category for adb." am: 6968d90dc5 am: 15dc5951e6 am: 96446b5bd3 
am: 19c4422c7c

Change-Id: I33a39902df365cf60cd5976d7977e18d36c09bc0
 2016-12-13 01:10:22 +00:00
Felipe Leme
663a9fcf24 Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours am: c398c0fc8d -s ours am: f93437d683 
am: bc5f9ad9ff  -s ours

Change-Id: I6ccc0774f8d4caa1c91d98bc1860df9180be0849
 2016-12-13 01:09:15 +00:00
Jerry Zhang
31c5c4cfc8 Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29" into nyc-mr2-dev-plus-aosp 
am: 49950e68b2

Change-Id: I6d111eb8c4afef7cb0615153c2949b0a3cf2155d
 2016-12-13 01:08:08 +00:00
Jerry Zhang
d9291d55f6 Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29 
am: 11dc0eccfb

Change-Id: Ibafebe4877052595cb34626bde9ac6fba1983fb0
 2016-12-13 01:02:55 +00:00
Android Build Merger (Role)
bf83fceb30 Merge "Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am: e40bb555d8 am: 0522f09bac -s ours" 2016-12-13 00:57:29 +00:00
Hugo Benichi
a98173a3ad Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am: e40bb555d8 
am: 0522f09bac  -s ours

Change-Id: I606e306f6ec68ac015e32c5e3069cc6b2b32b50e
 2016-12-13 00:56:43 +00:00
Android Build Merger (Role)
e07a88d1de Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am: a61684feb4 am: bfaccfc360 -s ours" 2016-12-13 00:56:26 +00:00
TreeHugger Robot
2894d0ac51 Merge "Untangle creation of Task from addition of AppToken in WM." 2016-12-13 00:56:09 +00:00
Hugo Benichi
f6d638ae97 DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am: a61684feb4 
am: bfaccfc360  -s ours

Change-Id: I2ec804fa3148971cccb2a0f1b34be6f1d05ef56e
 2016-12-13 00:55:38 +00:00
Josh Gao
19c4422c7c Merge "Add trace category for adb." am: 6968d90dc5 am: 15dc5951e6 
am: 96446b5bd3

Change-Id: I1d354df518f19d61eaa17e03fd696193464b6f7b
 2016-12-13 00:55:32 +00:00
Felipe Leme
bc5f9ad9ff Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours am: c398c0fc8d -s ours 
am: f93437d683

Change-Id: Ic77fec13bfac6f94b6297920fc304ad50af2ca8b
 2016-12-13 00:54:22 +00:00
Bill Yi
53ca81fee7 Import translations. DO NOT MERGE 
Change-Id: Ib707e6db3da131afd77fe1e56a3d30fbc8142bd0
Auto-generated-cl: translation import
 2016-12-12 16:52:27 -08:00
Hugo Benichi
fab84ceb8c Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev am: d792f9d032 
am: 05b1702f70

Change-Id: I7beccc9f82d7c9d111b8fe2eee1d0b7489b22db3
 2016-12-13 00:47:17 +00:00
Hugo Benichi
3efd677528 DO NOT MERGE NetworkMonitor: send one DNS probe per web probe am: eb5e9aa2ce 
am: a6ac3479af  -s ours

Change-Id: Icf0b845af40e0ba9492abdbda464cd5af8328e0d
 2016-12-13 00:46:22 +00:00
Hugo Benichi
9ed09f65be DO NOT MERGE NetworkMonitor metrics: add first validation information am: dd22982e25 
am: a948fb6bdc  -s ours

Change-Id: I8b82b58bdb3e07d56f90bdfcb51f6ef919694258
 2016-12-13 00:45:31 +00:00
Android Build Merger (Role)
49950e68b2 Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29" into nyc-mr2-dev-plus-aosp 2016-12-13 00:44:29 +00:00
Hugo Benichi
15ba29f0ef DO NOT MERGE Captive portal systel log improvements am: a4f17bcbdf 
am: 3dc894e7fe  -s ours

Change-Id: Id6c15e6ed64f460f7f08c7358c751c1ab6dc8d2e
 2016-12-13 00:43:49 +00:00
Hugo Benichi
25705f4bd9 Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev am: 4efaee1d0f 
am: 37c886fc6c  -s ours

Change-Id: I588e21de6e4a369d9d37d7d206b5e791752c1904
 2016-12-13 00:42:51 +00:00
Jerry Zhang
11dc0eccfb Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 
am: 88672d7d29

Change-Id: Ic083ac68e2a6acaa211cfb8baaf3b9ea0bbe47e2
 2016-12-13 00:42:47 +00:00
Josh Gao
96446b5bd3 Merge "Add trace category for adb." am: 6968d90dc5 
am: 15dc5951e6

Change-Id: I1e60464308807f09a4d89ee4c0fc1a007fb1be88
 2016-12-13 00:42:42 +00:00
Philip P. Moltmann
46771b9096 Do not write if apply() did not change the file. 
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
 2016-12-12 16:42:39 -08:00
Hugo Benichi
edf8c04a02 DO NOT MERGE APF: also drop any ICMPv6 RSs am: 0cc49bb5bc 
am: 0c93055001  -s ours

Change-Id: I4be8f03f956e149f80868fc1b3e2d503b1989b33
 2016-12-13 00:41:50 +00:00
Hugo Benichi
0522f09bac Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev 
am: e40bb555d8

Change-Id: I7981b678c7043b0680339178f5e3a86d456b60f2
 2016-12-13 00:41:44 +00:00
Hugo Benichi
bfaccfc360 DO NOT MERGE Logging improvements in CaptivePortalLoginActivity 
am: a61684feb4

Change-Id: I2e79e9fb5d2324d2b008bc1e4263d3bdeaf3752d
 2016-12-13 00:41:39 +00:00
Felipe Leme
f93437d683 Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours 
am: c398c0fc8d  -s ours

Change-Id: I44dd708ba7b890cc54f27cdcee7334c25a215411
 2016-12-13 00:41:15 +00:00
Jerry Zhang
88672d7d29 Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 
am: 830874dbe7

Change-Id: I930f006ffd7a429379638aa4f8268ed443a3696b
 2016-12-13 00:37:12 +00:00
Josh Gao
15dc5951e6 Merge "Add trace category for adb." 
am: 6968d90dc5

Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1
 2016-12-13 00:36:54 +00:00
Hugo Benichi
05b1702f70 Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev 
am: d792f9d032

Change-Id: I4974f56b4c47f55e337e7f0ca5fb5cbd35b581b1
 2016-12-13 00:35:17 +00:00
Hugo Benichi
a6ac3479af DO NOT MERGE NetworkMonitor: send one DNS probe per web probe 
am: eb5e9aa2ce

Change-Id: I2e3d9794e56d434f838ead9f12ee4edc74a3d6f2
 2016-12-13 00:35:08 +00:00
Hugo Benichi
a948fb6bdc DO NOT MERGE NetworkMonitor metrics: add first validation information 
am: dd22982e25

Change-Id: I9540a8357fd44cfcb17b244c66e5883f3a1a100b
 2016-12-13 00:34:19 +00:00
Hugo Benichi
3dc894e7fe DO NOT MERGE Captive portal systel log improvements 
am: a4f17bcbdf

Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6
 2016-12-13 00:32:46 +00:00
Hugo Benichi
37c886fc6c Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev 
am: 4efaee1d0f

Change-Id: I70780ebd72fc756a28d1d46ad4a029c29a75f9c4
 2016-12-13 00:31:21 +00:00
Hugo Benichi
0c93055001 DO NOT MERGE APF: also drop any ICMPv6 RSs 
am: 0cc49bb5bc

Change-Id: I8788a2572bbf7e7b4004c8fb83aa22c560438db7
 2016-12-13 00:31:16 +00:00
Felipe Leme
c398c0fc8d Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." 
am: ff93f927e4  -s ours

Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344
 2016-12-13 00:30:21 +00:00
Josh Gao
6968d90dc5 Merge "Add trace category for adb." 2016-12-13 00:28:09 +00:00