Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,445 Commits 3 Branches 0 Tags
0877a45f02e358e72be0cd4e7fa27de11f2b0ffd
Commit Graph

281445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
0877a45f02 Merge "resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 3c9b36482f" into nyc-mr2-dev-plus-aosp 2017-01-13 21:24:07 +00:00
Andrew Scull
8203155664 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 
am: 3c9b36482f

Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13
 2017-01-13 21:23:27 +00:00
Android Build Merger (Role)
7dfd0b9843 Merge changes from topic 'am-72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp 
* changes:
  Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 am: 0dfa7b58b8
  Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e  -s ours am: 2288ee6b01
 2017-01-13 21:23:09 +00:00
Philip P. Moltmann
af5875d1be Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 
am: 0dfa7b58b8

Change-Id: I64d9e83dbabdf1f3f3574cea135488cb86d4a2c1
 2017-01-13 21:22:16 +00:00
Philip P. Moltmann
44ee186c79 Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e -s ours 
am: 2288ee6b01

Change-Id: Idcd4200ad47c5fd7d007b2a717941cec5db08595
 2017-01-13 21:21:11 +00:00
Joachim Sauer
b26cc7f971 Merge "Add java.time APIs." am: 0938b22c0a am: d05e19954b 
am: 88002e8e38

Change-Id: I82a83e52e96bff1b43ca8bca7afe9b32877c3ecb
 2017-01-13 21:19:56 +00:00
Erik Kline
c8c42637d9 Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am: caf62d305e am: a94e66868c 
am: 21a148550d

Change-Id: I04b03ff7cee505e8322320ec3d0ee10e6dbf2b09
 2017-01-13 21:17:39 +00:00
Erik Kline
930ff60ca8 Move explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6 am: 7340e272c3 
am: ca6d265bbe

Change-Id: Ia761aeaa897538666cc690aac61092f38bb9b425
 2017-01-13 21:16:46 +00:00
Andrew Scull
3c9b36482f resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 
am: 3aac3ebee1

Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
 2017-01-13 21:16:31 +00:00
Chen Xu
10839091d9 Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e 
am: c90dc2072c

Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
 2017-01-13 21:15:55 +00:00
Philip P. Moltmann
0dfa7b58b8 Do not write if apply() did not change the file. am: 1f99f81bdc 
am: 331a4bb8d4

Change-Id: If200192c12477a4410b0b358e6c7b430c23d1499
 2017-01-13 21:15:18 +00:00
Philip P. Moltmann
1156bf1dc1 Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 
am: 764a7901e6

Change-Id: I845318f60eadb6c31f9795024cf10df33a15dc20
 2017-01-13 21:14:41 +00:00
Philip P. Moltmann
2288ee6b01 Only persist last Shared Preferences state am: d15c4f1da5 
am: 889a420a9e  -s ours

Change-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d
 2017-01-13 21:14:17 +00:00
Philip P. Moltmann
6a1dcd17e4 Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e 
am: 0aa5138861  -s ours

Change-Id: Ide515ec901a5a85c3ef04bc6cff172464144877d
 2017-01-13 21:13:46 +00:00
Justin Klaassen
84d0b9ea6b Merge "Add support for carrier demo mode" into nyc-mr2-dev 
am: 482ba6b831

Change-Id: If0368c791ec1d866fc46bd781a5adb4c1bc14186
 2017-01-13 21:04:55 +00:00
Justin Klaassen
b4be8c8df1 Add support for carrier demo mode 
am: b632c55469

Change-Id: Ib8061ae05e5144a79921123ba6dfdaec81baaece
 2017-01-13 21:04:31 +00:00
Justin Klaassen
482ba6b831 Merge "Add support for carrier demo mode" into nyc-mr2-dev 2017-01-13 21:00:08 +00:00
Pankaj Kanwar
074a166e28 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev 
am: ae9e15fa44

Change-Id: I33fff8bcc19daa149f1ad41b3f3cf94281f81ec4
 2017-01-13 20:58:15 +00:00
pkanwar
07998e8e26 DO NOT MERGE: Fix to maintain the Carrier Network connection. 
am: e45b50293e

Change-Id: I6a48b308cd461097a195a073249cde096cc74886
 2017-01-13 20:58:09 +00:00
Pankaj Kanwar
ae9e15fa44 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev 2017-01-13 20:46:02 +00:00
Andrew Sapperstein
ace5aea996 Merge "Add logging for high temp warning." into nyc-mr2-dev 
am: 409d93356c

Change-Id: I83cef78c03fbbbe1e8e66f2215ca9d7be2095047
 2017-01-13 20:28:40 +00:00
Andrew Sapperstein
990826a0a1 Add logging for high temp warning. 
am: 6c08f8da09

Change-Id: Id567e12b8eb6b85ab49ace003c03b80759073687
 2017-01-13 20:28:35 +00:00
TreeHugger Robot
409d93356c Merge "Add logging for high temp warning." into nyc-mr2-dev 2017-01-13 20:24:50 +00:00
Manu Cornet
07ed38cddc Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 
am: a4d01c8573

Change-Id: I240109d6f400bc29e398b2cf07b238b9b17713f3
 2017-01-13 19:58:42 +00:00
Manu Cornet
548ff6209c DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations 
am: 569cbecd92

Change-Id: I4da39588dd8ba6f750cbedbe3abb9ebce1dd8080
 2017-01-13 19:58:35 +00:00
TreeHugger Robot
a4d01c8573 Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 2017-01-13 19:54:20 +00:00
Justin Klaassen
b632c55469 Add support for carrier demo mode 
Fixes: 33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly

Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
 2017-01-13 09:26:58 -08:00
Andrew Scull
3aac3ebee1 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev 
am: eb35ad9969

Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
 2017-01-13 17:17:49 +00:00
Andrew Scull
eb35ad9969 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev 
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
 2017-01-13 15:28:36 +00:00
Andrew Scull
ad4aa1ce7d resolve merge conflicts of e4cefbf4fc to nyc-dr1-dev 
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
 2017-01-13 13:16:09 +00:00
Joachim Sauer
88002e8e38 Merge "Add java.time APIs." am: 0938b22c0a 
am: d05e19954b

Change-Id: I08e6eedff692aa2be86224ffb1869e7a57182db5
 2017-01-13 10:34:55 +00:00
Joachim Sauer
d05e19954b Merge "Add java.time APIs." 
am: 0938b22c0a

Change-Id: Ie1169d1af12228ac63f43efdf7f18e7dcb705bee
 2017-01-13 10:27:05 +00:00
Joachim Sauer
0938b22c0a Merge "Add java.time APIs." 2017-01-13 10:18:20 +00:00
Michal Karpinski
3f0307c050 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 
am: 54b7388163

Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
 2017-01-13 09:51:32 +00:00
Michal Karpinski
f27cc410dd [DPM] Improvements to the network logs batch finalization mechanism 
am: 4da4a5d0c8

Change-Id: I6318392173aeb2653734537569d03158799a099c
 2017-01-13 09:51:27 +00:00
Michal Karpinski
54b7388163 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 2017-01-13 09:47:24 +00:00
Erik Kline
21a148550d Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am: caf62d305e 
am: a94e66868c

Change-Id: Ie4d1cf3ef1729fc92de6a209a66e2e1ad386fb32
 2017-01-13 07:18:55 +00:00
Erik Kline
ca6d265bbe Move explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6 
am: 7340e272c3

Change-Id: Ie5065a8224e392dafc75e9f9cd9e07587e46b814
 2017-01-13 07:17:47 +00:00
Erik Kline
a94e66868c Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" 
am: caf62d305e

Change-Id: I8befc4b903289a21cfdcdaa16bbaeff7e9247892
 2017-01-13 07:11:47 +00:00
Erik Kline
7340e272c3 Move explicit mobile request handling into UpstreamNetworkMonitor 
am: fdd4111ef6

Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03
 2017-01-13 07:11:43 +00:00
Treehugger Robot
caf62d305e Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" 2017-01-13 07:03:17 +00:00
Erik Kline
fdd4111ef6 Move explicit mobile request handling into UpstreamNetworkMonitor 
Also:
    - some minor typo fixes
    - some minor style fixes
    - variable renames for clarity

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - regular (no DUN) wifi tethering to mobile works
    - USB tethering with switching between mobile and wifi works
Bug: 32163131
Change-Id: I113536f24436f0b962f402f3b37386e29468dc0a
 2017-01-13 14:09:57 +09:00
pkanwar
e45b50293e DO NOT MERGE: Fix to maintain the Carrier Network connection. 
Added isCarrierNetwork param in WifiConfiguration, which is then used in
WifiStateMachine. After this change, the connection to Carrier Network
should be maintained.

BUG: 30760683
Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89
 2017-01-12 19:25:52 -08:00
Manu Cornet
4c7317373c Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev 
am: 2660111259

Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
 2017-01-13 02:36:06 +00:00
Manu Cornet
afd96a08b1 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents 
am: da5900d0a7

Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
 2017-01-13 02:36:02 +00:00
Chen Xu
c90dc2072c Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd 
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
 2017-01-13 02:33:24 +00:00
TreeHugger Robot
2660111259 Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev 2017-01-13 02:31:13 +00:00
Chen Xu
1d0877f59e Merge "Default Carrier app for traffic mitigation" 
am: 4533b1ccdd

Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96
 2017-01-13 02:28:28 +00:00
Chen Xu
4533b1ccdd Merge "Default Carrier app for traffic mitigation" 2017-01-13 02:22:38 +00:00
Andrew Sapperstein
6c08f8da09 Add logging for high temp warning. 
Adds a log line that prints the current and throttling temps
when we decide to show the notification.

Test: manual
Bug: 34256597
Change-Id: I4d0a1993e0b073d68fbc65f9aa765f5343a69dc5
 2017-01-12 17:23:11 -08:00