Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,505 Commits 3 Branches 0 Tags
aefdfa57213397df609ca68adc906a76989ac110
Commit Graph

37019 Commits

Author SHA1 Message Date
Gustav Sennton
efdd58b1df Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev am: 45e2966 
am: c08ac79

* commit 'c08ac79a21722bf793d328e652e6f64118d90fca':
  Update persistent WebView packages setting only when user changes it.

Change-Id: Ied22fed362a718cff0b1892dc199ac74e336de03
 2016-04-14 19:28:23 +00:00
Gustav Sennton
9a98665504 Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev am: f014c74 
am: 666bdef

* commit '666bdefa2726ab2f5d93b3058a29c7fb81bd749f':
  Ensure at least one default-available webview package is a non-fallback

Change-Id: Ib7943ba13f9760bf8385829c699066058d23acc8
 2016-04-14 19:27:53 +00:00
TreeHugger Robot
ceac5dd9de Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev am: 0628d32 
am: 886d17c

* commit '886d17c035805cef3bce3d2d96e53ba48bf5b62b':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: I8c82f1058531d1f5a0cdb73314b8fd742dae7860
 2016-04-14 19:26:50 +00:00
Hugo Benichi
018a9d3127 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev am: fc18b6f 
am: 39de1e2

* commit '39de1e2de51f4c0789904abb1623c8b7d648411e':
  Add DHCP error event class and record DHCP errors.

Change-Id: I8262883d6178be380265cf35497782f35dab043c
 2016-04-14 18:52:01 +00:00
Pierre Imai
87421a21c7 Merge changes Ia71865a9,I40b6de54 into nyc-dev am: 1feca76 
am: f8ef3c3

* commit 'f8ef3c36a97b68b5e27127681973244f481cca09':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: If019f2c448ed3411a0b23dfdd6038e1b9fe2099d
 2016-04-14 18:51:38 +00:00
Hugo Benichi
9536eac1b7 Merge "Add volatile qualifier to boolean variable" into nyc-dev am: fbd47ca 
am: 1b6f396

* commit '1b6f396978df419b20e302142171b48a477c9c1c':
  Add volatile qualifier to boolean variable

Change-Id: I78bc22e8c5991c5b18cec761f42dbdcfe8d4cfe8
 2016-04-14 18:49:23 +00:00
Dianne Hackborn
82d2b16135 Merge "Fix issue #28156248: Receiving connectivity receiver..." into nyc-dev am: 37ce022 
am: 77f20d8

* commit '77f20d8026a2b1475e93681d38ada81879216d52':
  Fix issue #28156248: Receiving connectivity receiver...

Change-Id: I7d39045a9fb552cea0ac633a9310d19c8107143b
 2016-04-14 18:48:20 +00:00
TreeHugger Robot
42de05b970 Merge "Limit don\'t dispatch when non-interactive and the display is off to watches" into nyc-dev am: 015e42a 
am: 3aef23e

* commit '3aef23e885957310ad27fcf20f11bf4f999edc5a':
  Limit don't dispatch when non-interactive and the display is off to watches

Change-Id: If6c696be7cdad708b9710067a2969171175d1029
 2016-04-14 18:47:09 +00:00
TreeHugger Robot
b03419e212 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev am: f824e58 
am: 48f8f29

* commit '48f8f2951bf54dcf998916e915e150f782088c71':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Idda93d8b3c1b3d6a12d3958627fb291f647b18dd
 2016-04-14 18:45:53 +00:00
Carlos Valdivia
fb0229596d Merge "Improve CryptoHelper" into nyc-dev am: 2cde05c 
am: b6aa48a

* commit 'b6aa48a469820c2a92b46d4ebf2b89f97511094a':
  Improve CryptoHelper

Change-Id: I11bddcaf6ceb0a5473e384137fff8ff8c4dd698c
 2016-04-14 18:40:12 +00:00
Julia Reynolds
b14349b146 Merge "Allow notification listeners full DND access." into nyc-dev am: 5776729 
am: c19ce28

* commit 'c19ce2808dff16f614b753452d3dcf4473b4bfdf':
  Allow notification listeners full DND access.

Change-Id: I92007cd4628b36f8257f9ddbd4ddef968e88b1f0
 2016-04-14 18:39:33 +00:00
Erik Kline
5617fece1b Merge "Also consider loss of IPv6 default route to be fatal" into nyc-dev am: 7596e9c 
am: 47719fc

* commit '47719fc1b0794a6c9ae243eba931fcd101702c33':
  Also consider loss of IPv6 default route to be fatal

Change-Id: I5fb5dc597edffd5866a86524461a74f09e64e0b1
 2016-04-14 18:37:12 +00:00
TreeHugger Robot
71f8c4c475 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev am: c142a8c 
am: 69df48c

* commit '69df48c44602f0ab64725dd82444fda23bc7f2bf':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Idf437251b407c2682e6f52608031178aa1040eeb
 2016-04-14 18:33:55 +00:00
Lifu Tang
ad21e70a7d Merge "Fixed bugs when deliver GnssMeasurement from N-HAL" into nyc-dev am: ceeb44d 
am: 53ca6bf

* commit '53ca6bfe5880fddb75cb382ec991376459b6e739':
  Fixed bugs when deliver GnssMeasurement from N-HAL

Change-Id: Ieb217f84e2796e6a9f7ecd26c50cad98ce0b82f2
 2016-04-14 18:30:51 +00:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c 
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
 2016-04-14 10:27:31 -07:00
Gustav Sennton
c08ac79a21 Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev 
am: 45e2966

* commit '45e2966da9f81077777bb6df61e9a880790741ec':
  Update persistent WebView packages setting only when user changes it.

Change-Id: I8cc5ad1e7bd0dae467413362a23dc803e5aab9ee
 2016-04-14 11:05:33 +00:00
Gustav Sennton
45e2966da9 Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev 2016-04-14 10:58:42 +00:00
Gustav Sennton
666bdefa27 Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev 
am: f014c74

* commit 'f014c74ec4070f1c903bbb8ac82d80b2ddbfe306':
  Ensure at least one default-available webview package is a non-fallback

Change-Id: I2128b569cdb414b9ae8d4b15baa36d4e8919a9db
 2016-04-14 10:32:15 +00:00
Gustav Sennton
f014c74ec4 Merge "Ensure at least one default-available webview package is a non-fallback" into nyc-dev 2016-04-14 10:25:14 +00:00
Erik Kline
886d17c035 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev 
am: 0628d32

* commit '0628d324d0f1c2116c051faadd8e4bf26206b1a6':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: Ibcbd79a6674cf062138ccbd031d14721b0367e22
 2016-04-14 10:20:17 +00:00
TreeHugger Robot
0628d324d0 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev 2016-04-14 10:14:20 +00:00
Erik Kline
48f12f2ad6 Also log IPv4 and IPv6 connectivity of any previous default network 
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
 2016-04-14 17:54:46 +09:00
Hugo Benichi
39de1e2de5 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 
am: fc18b6f

* commit 'fc18b6f3608d87f3dc53cda8d8db30636c92d6e9':
  Add DHCP error event class and record DHCP errors.

Change-Id: I5b9ef8b191ab0ef4349ed00c1d8f548393aba368
 2016-04-14 08:08:54 +00:00
Hugo Benichi
fc18b6f360 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 2016-04-14 08:01:31 +00:00
Pierre Imai
f8ef3c36a9 Merge changes Ia71865a9,I40b6de54 into nyc-dev 
am: 1feca76

* commit '1feca76bd48008aa3421c8741cb147ecc1a6e912':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: I2aea598dd2926c18fdb4e6301759539c504038dc
 2016-04-14 07:31:38 +00:00
Pierre Imai
1feca76bd4 Merge changes Ia71865a9,I40b6de54 into nyc-dev 
* changes:
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.
 2016-04-14 07:25:34 +00:00
Hugo Benichi
6241874355 Add DHCP error event class and record DHCP errors. 
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.

Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
 2016-04-14 15:40:10 +09:00
Pierre Imai
04e22225a7 Log an event whenever we lose the default network. 
Change-Id: Ia71865a90b2db5dc0d3ad627563a6b1f99686f04
 2016-04-14 15:38:29 +09:00
Pierre Imai
6b4e15b155 Record the transport types for connectivity events. 
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
 2016-04-14 15:38:17 +09:00
Hugo Benichi
1b6f396978 Merge "Add volatile qualifier to boolean variable" into nyc-dev 
am: fbd47ca

* commit 'fbd47caf4099d7bd83e40b2cf9b4bc54ede4ca8f':
  Add volatile qualifier to boolean variable

Change-Id: I8e89883356ccf1e1a265f08fc55e647de65bd340
 2016-04-14 04:21:56 +00:00
Dianne Hackborn
77f20d8026 Merge "Fix issue #28156248: Receiving connectivity receiver..." into nyc-dev 
am: 37ce022

* commit '37ce0221891a3c38f23a3f713111ee921385e931':
  Fix issue #28156248: Receiving connectivity receiver...

Change-Id: I27ed05bbc2a874f0508d681b6aef8de489ca0265
 2016-04-14 04:21:53 +00:00
Hugo Benichi
fbd47caf40 Merge "Add volatile qualifier to boolean variable" into nyc-dev 2016-04-14 04:19:50 +00:00
Dianne Hackborn
37ce022189 Merge "Fix issue #28156248: Receiving connectivity receiver..." into nyc-dev 2016-04-14 04:16:10 +00:00
Wale Ogunwale
3aef23e885 Merge "Limit don\'t dispatch when non-interactive and the display is off to watches" into nyc-dev 
am: 015e42a

* commit '015e42aef65509270462e3f8e6b165a39d3e37fa':
  Limit don't dispatch when non-interactive and the display is off to watches

Change-Id: Id8bd38d5e7fdba893cae3148d82f7fd6b9f5a47f
 2016-04-14 04:01:52 +00:00
TreeHugger Robot
015e42aef6 Merge "Limit don't dispatch when non-interactive and the display is off to watches" into nyc-dev 2016-04-14 03:56:22 +00:00
Erik Kline
48f8f2951b Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev 
am: f824e58

* commit 'f824e58d493bb86789bcb8de27a2e43a762c5d3e':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Icc62c058b26a8b31f3651569371dbb231cef4502
 2016-04-14 03:27:17 +00:00
TreeHugger Robot
f824e58d49 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev 2016-04-14 03:20:40 +00:00
Wale Ogunwale
6b15ea5cea Limit don't dispatch when non-interactive and the display is off to watches 
We still want to dispatch input for non-watch devices when the non-interactive
and the display is off.

Bug: 26277593
Change-Id: I38023b3494e46c63578dd3162e2b9aa0a213862d
 2016-04-13 19:29:55 -07:00
Erik Kline
5b25a0f796 Add some more metrics: IpManager, IpReachabilityMonitor 
Change-Id: Ibb7150c849715a42fc2c879589eaaf86e8a007e7
 2016-04-14 10:53:30 +09:00
Carlos Valdivia
b6aa48a469 Merge "Improve CryptoHelper" into nyc-dev 
am: 2cde05c

* commit '2cde05c3bb9267ba6be456af43b0b0710a06c6ea':
  Improve CryptoHelper

Change-Id: I55ede151eac4470e67ac64cbc513936783ae609a
 2016-04-14 01:25:11 +00:00
Carlos Valdivia
2cde05c3bb Merge "Improve CryptoHelper" into nyc-dev 2016-04-14 01:17:08 +00:00
Dianne Hackborn
0e5da8c506 Fix issue #28156248: Receiving connectivity receiver... 
...broadcasts in Android N

Ooops.

Change-Id: I91ae6d3993e5e295965d8825e07993e67d10b357
 2016-04-13 18:05:44 -07:00
Julia Reynolds
c19ce2808d Merge "Allow notification listeners full DND access." into nyc-dev 
am: 5776729

* commit '577672966cf466db37e6af1e383111de008154a3':
  Allow notification listeners full DND access.

Change-Id: Iaa2d981df2df105a516ffa27849412fa907f0e05
 2016-04-14 01:01:31 +00:00
Julia Reynolds
577672966c Merge "Allow notification listeners full DND access." into nyc-dev 2016-04-14 00:57:37 +00:00
Erik Kline
47719fc1b0 Merge "Also consider loss of IPv6 default route to be fatal" into nyc-dev 
am: 7596e9c

* commit '7596e9cdff0fda7d675ff31eef7225b38f316fa6':
  Also consider loss of IPv6 default route to be fatal

Change-Id: I566cfd51a01286a0311566f2acaaf14e739f5e70
 2016-04-14 00:56:10 +00:00
Erik Kline
7596e9cdff Merge "Also consider loss of IPv6 default route to be fatal" into nyc-dev 2016-04-14 00:51:09 +00:00
Adrian Roos
69df48c446 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev 
am: c142a8c

* commit 'c142a8c43fa7d1b6c9d797e044060755d9ecfcd6':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Id81115f8311e797f0b7d8a435226ea5862a9550a
 2016-04-14 00:08:08 +00:00
TreeHugger Robot
c142a8c43f Merge "StrongAuthTracker: Don't rely on USER_PRESENT" into nyc-dev 2016-04-14 00:04:54 +00:00
Mike Cailean
53ca6bfe58 Merge "Fixed bugs when deliver GnssMeasurement from N-HAL" into nyc-dev 
am: ceeb44d

* commit 'ceeb44daf9fcd2b78a4f64d3b0d4f709b093e3c2':
  Fixed bugs when deliver GnssMeasurement from N-HAL

Change-Id: I970b1bafe67cfcc0caec5ad4fbe3073bb1e679d8
 2016-04-13 23:46:36 +00:00
Carlos Valdivia
766b283293 Improve CryptoHelper 
No longer reuses IV, also stops using SecretKeySpec's, and leaves it to
the Cipher to create the IV.

Bug: 27579433
Change-Id: I11a1cbf525146495fb4209ec6606223a6b15b7bc
 2016-04-13 23:43:12 +00:00