drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
313,629 Commits 1 Branch 0 Tags
Commit Graph

313629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
a89137545b Merge "Change requestWait API according to request" into oc-dev 
am: ca687ac39a

Change-Id: I19a3ca83efc1934448e1044b9be74087f89dd030
 2017-04-07 13:27:33 +00:00
TreeHugger Robot
ca687ac39a Merge "Change requestWait API according to request" into oc-dev 2017-04-07 13:19:12 +00:00
Lorenzo Colitti
fe523c4917 Merge "Add NETWORK_STACK permission" into oc-dev 
am: 087daa0da5

Change-Id: I4eb02f88b6fecc92539516c859a07d61ffecd86e
 2017-04-07 12:48:26 +00:00
TreeHugger Robot
087daa0da5 Merge "Add NETWORK_STACK permission" into oc-dev 2017-04-07 12:40:24 +00:00
Filip Pavlis
3b3bf87165 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev 
am: 59dd2ebfc1

Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb
 2017-04-07 10:38:35 +00:00
Filip Pavlis
59dd2ebfc1 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev 2017-04-07 10:31:44 +00:00
Jakub Pawlowski
93cba9eeca Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am: 909f3b108f 
am: bc095f035d

Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a
 2017-04-07 07:14:36 +00:00
Jakub Pawlowski
bc095f035d Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 
am: 909f3b108f

Change-Id: Iba1be10854f9f7c8fd1459150dfdc79ac8eac395
 2017-04-07 07:05:32 +00:00
Jakub Pawlowski
909f3b108f Merge "Bluetooth 5 fix default AdvertisingSetParameters values" 
am: 7bf58d5975

Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2
 2017-04-07 06:57:30 +00:00
Treehugger Robot
7bf58d5975 Merge "Bluetooth 5 fix default AdvertisingSetParameters values" 2017-04-07 06:44:50 +00:00
Bryce Lee
c1ed86ab10 Merge "Do not make strong reference to Resources." into oc-dev 
am: 327c0b9f88

Change-Id: I0e11d59f701d6effd5500909e4d27a649e22472a
 2017-04-07 06:29:24 +00:00
TreeHugger Robot
327c0b9f88 Merge "Do not make strong reference to Resources." into oc-dev 2017-04-07 06:21:00 +00:00
Lorenzo Colitti
ab19a04855 Add NETWORK_STACK permission 
Add a new permission that only allows other system services to call
networking related methods.  This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.

Bug: 36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294
(cherry picked from commit fa84050a7e51e2a6643ea242b43f16cd6e3114dd)
 2017-04-07 05:37:21 +00:00
Lorenzo Colitti
fa84050a7e Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 
am: d6b2e7ac93

Change-Id: I116011c73f20bdd3c23d58c19fc083e2387979ab
 2017-04-07 05:13:29 +00:00
Lorenzo Colitti
d6b2e7ac93 Merge "Add NETWORK_STACK permission" am: b23fabf3fd 
am: 09146fc440

Change-Id: If0ebaea53188d008ce1cf81ac4f3356c9943dad8
 2017-04-07 05:04:49 +00:00
Lorenzo Colitti
09146fc440 Merge "Add NETWORK_STACK permission" 
am: b23fabf3fd

Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a
 2017-04-07 05:00:15 +00:00
Lorenzo Colitti
b23fabf3fd Merge "Add NETWORK_STACK permission" 2017-04-07 04:51:14 +00:00
Bryce Lee
2d2315a66d Do not make strong reference to Resources. 
This CL removes the strong reference added for mapping display ids
and Resources to Displays. Instead, the key pair is now the display
id and ResourcesKey, and the mapping is pruned when key is
invalidated.

Change-Id: I60d767b52de7bbf769f6761f5a3301dd7aff6ddf
Fixes: 36625868
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases --test android.app.cts.DisplayTest#testRotation
 2017-04-06 21:32:31 -07:00
Hugo Benichi
cf247ffa87 Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev 
am: 8ce439a768

Change-Id: Ic5984629c83f4af4175a40b6cb70ad5741ca4e25
 2017-04-07 03:54:47 +00:00
TreeHugger Robot
8ce439a768 Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev 2017-04-07 03:47:26 +00:00
Philip P. Moltmann
d45000c1a9 resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp 
Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5
 2017-04-06 20:25:45 -07:00
Android Build Merger (Role)
d17977dea3 Merge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am: deb64ea13e am: bdebc29751" into oc-dev-plus-aosp 2017-04-07 03:12:02 +00:00
Hugo Benichi
8e7682caf4 Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am: deb64ea13e 
am: bdebc29751

Change-Id: I6ce46b76d20d8cad5badb5fd3714c42a70988a06
 2017-04-07 03:11:09 +00:00
Felipe Leme
662db89478 Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev 
am: 53b6f00dc5

Change-Id: I553c58613ea0b1ee933a40f5bcbf6c0c49c8b2dd
 2017-04-07 03:08:25 +00:00
Amith Yamasani
d0709eca29 Merge "Log excessive remote callbacks" into oc-dev 
am: 6c171f35be

Change-Id: I9c1703a6c9cff68ee5262c91380c4647a2a79812
 2017-04-07 03:06:50 +00:00
Philip P. Moltmann
3c002e45dd Merge "Return inet addr for discoverable printers" into oc-dev 2017-04-07 03:04:17 +00:00
Hugo Benichi
bdebc29751 Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 
am: deb64ea13e

Change-Id: I8d9304663e8b5019b65bf048cc7a72e6e9e43043
 2017-04-07 03:03:41 +00:00
Rebecca Silberstein
ea55ae7d0c Add NETWORK_STACK permission 
Add a new permission that only allows other system services to call
networking related methods.  This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.

Bug: 36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294
 2017-04-07 03:03:26 +00:00
Calin Juravle
63b897585a Merge "Check for a null packageInfo before notifying about app install" into oc-dev 
am: 1fd46de245

Change-Id: Ie5591a52e947af61fc04a2b1f64a2fe370f5e657
 2017-04-07 03:01:45 +00:00
TreeHugger Robot
53b6f00dc5 Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev 2017-04-07 03:00:07 +00:00
TreeHugger Robot
6c171f35be Merge "Log excessive remote callbacks" into oc-dev 2017-04-07 02:58:53 +00:00
Hugo Benichi
deb64ea13e Merge "NetworkMonitor: improve captive portal validation logs" 
am: d6933a6c14

Change-Id: I8f0fd26d6a9f036adc9cc895690aac27d4b8e9cd
 2017-04-07 02:56:11 +00:00
Calin Juravle
1fd46de245 Merge "Check for a null packageInfo before notifying about app install" into oc-dev 2017-04-07 02:53:22 +00:00
Treehugger Robot
d6933a6c14 Merge "NetworkMonitor: improve captive portal validation logs" 2017-04-07 02:48:56 +00:00
Casey Burkhardt
bc411cd461 Merge "Revise Accessibility button chooser intent/permissions" into oc-dev 
am: ecb5b5ccc3

Change-Id: I7aa9a6760ff74e35875aa24e86f88dc72603075b
 2017-04-07 02:45:28 +00:00
Casey Burkhardt
ecb5b5ccc3 Merge "Revise Accessibility button chooser intent/permissions" into oc-dev 2017-04-07 02:40:14 +00:00
Android Build Merger (Role)
711633b0c6 Merge "Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c am: f0928412b0" into oc-dev-plus-aosp 2017-04-07 02:38:27 +00:00
Hugo Benichi
1ac701d618 Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c 
am: f0928412b0

Change-Id: If83fae5f70cb2e253a4107591f43d9ce2d648006
 2017-04-07 02:37:44 +00:00
Chad Brubaker
49b607a61e Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev 
am: c56d782e13

Change-Id: I14d241e63ead50651ca21aa1d28bce3ba019b5fc
 2017-04-07 02:37:36 +00:00
Hugo Benichi
f0928412b0 Merge "ConnectivityService: safer locking" am: b8dc7fbc6d 
am: b960ee662c

Change-Id: If4985a8d51c03ea6cc3be121962bbf27f980fdc7
 2017-04-07 02:29:44 +00:00
TreeHugger Robot
c56d782e13 Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev 2017-04-07 02:28:23 +00:00
Hugo Benichi
b960ee662c Merge "ConnectivityService: safer locking" 
am: b8dc7fbc6d

Change-Id: I88a118bb59f8a870d42d2d665f838f5236ebd21c
 2017-04-07 02:21:41 +00:00
Hugo Benichi
b8dc7fbc6d Merge "ConnectivityService: safer locking" 2017-04-07 02:10:45 +00:00
Jason Monk
574642fef7 Merge "Tuner plugin settings updates" into oc-dev 
am: eaf6b3b193

Change-Id: If20613b2a78c70b073b00dfc33bd832e3c4b5dc9
 2017-04-07 01:49:16 +00:00
Jason Monk
eaf6b3b193 Merge "Tuner plugin settings updates" into oc-dev 2017-04-07 01:39:28 +00:00
Steven Moreland
2ab4458405 Merge "Use hwservicemanager getTransport." am: 562ed84ff4 am: 9912ec4ca6 
am: ea377a967f  -s ours

Change-Id: Idb0e7c9d95ade65922241316fe1c75b5cee56d98
 2017-04-07 01:29:42 +00:00
Steven Moreland
ea377a967f Merge "Use hwservicemanager getTransport." am: 562ed84ff4 
am: 9912ec4ca6

Change-Id: I08c33de1eb82b6717b4a9d4d76211dd0fa638d52
 2017-04-07 01:24:38 +00:00
Tima Vaisburd
0b1023a263 Merge "Added onMovedToDisplay method to WebView" into oc-dev 
am: be41b61216

Change-Id: Ib119a90509998347b6ad26862ddfdb2d5299fb42
 2017-04-07 01:24:36 +00:00
TreeHugger Robot
be41b61216 Merge "Added onMovedToDisplay method to WebView" into oc-dev 2017-04-07 01:18:59 +00:00
Steven Moreland
9912ec4ca6 Merge "Use hwservicemanager getTransport." 
am: 562ed84ff4

Change-Id: I39ee473166dce391f3cad4acf62821a4dfb9f444
 2017-04-07 01:18:36 +00:00