Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
376,412 Commits 3 Branches 0 Tags
5e2bcb2cddafb8754d4f008778e53486d36e7eef
Commit Graph

83747 Commits

Author SHA1 Message Date
Mathew Inwood
a0c5ec60b3 Merge "Add @UnsupportedAppUsage annotations" am: 9137ecafbd 
am: 2e5fdd0051

Change-Id: I217e9d2fbad18653d33a5a775047a5b0ffaba55d
 2018-08-30 09:10:27 -07:00
Mathew Inwood
2e5fdd0051 Merge "Add @UnsupportedAppUsage annotations" 
am: 9137ecafbd

Change-Id: I467341cc8f70554f58266ddc28ff3a648ec5cc18
 2018-08-30 08:57:54 -07:00
Mathew Inwood
71da3a1fe4 Add @UnsupportedAppUsage annotations 
For all remaining unannotated code.

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I32861fa341a08f11a9c50c07a1ef7404dadf6bb6
Merged-In: I67c8b71ea535ebffb10bf577948bd4ccb8ca069d
 2018-08-30 13:38:01 +01:00
Benjamin Miller
a63d7aaa7f Merge "Docs: fixed formatting for setLaunchBounds()" into pi-dev 
am: 7795e97f27

Change-Id: If08dc4bfcb5516cb06aa03603016ca127e6a4ed2
 2018-08-29 18:53:59 -07:00
TreeHugger Robot
7795e97f27 Merge "Docs: fixed formatting for setLaunchBounds()" into pi-dev 2018-08-30 01:45:55 +00:00
Benjamin Miller
6ec43e021c Merge "Docs: fixed a broken link in SystemUpdatePolicy" into pi-dev 
am: 8bb6781e56

Change-Id: I9e0f0273f05e2f96704749b9d73557e82efd4339
 2018-08-29 17:36:27 -07:00
TreeHugger Robot
8bb6781e56 Merge "Docs: fixed a broken link in SystemUpdatePolicy" into pi-dev 2018-08-30 00:18:32 +00:00
Benjamin Miller
1a96e5c5d3 Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev 
am: 53141c3984

Change-Id: I34c30f2a7e02590d551a0f327ab55cb56a550c4c
 2018-08-29 16:33:36 -07:00
TreeHugger Robot
53141c3984 Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev 2018-08-29 23:22:01 +00:00
dwchen
df80c8d7cc Merge "Fixes possible issue with no-op creator." into pi-dev 
am: f5411070a8

Change-Id: I29e126cdf7b4929a5ffd1fadafb3b93fc5ee8ca0
 2018-08-29 15:35:43 -07:00
TreeHugger Robot
f5411070a8 Merge "Fixes possible issue with no-op creator." into pi-dev 2018-08-29 22:07:27 +00:00
Benjamin Miller
8a12c12ad2 docs: Added reminder that custom CAs aren't automatically trusted by apps. 
Compact reminder with CTA to read more in Security & Privacy best
practices document.

Test: make ds-docs and inspect generated HTML in the browser.
Bug: 29000858
Change-Id: If74bfd50f85f044214f6db1950351d2f2014e0ae
 2018-08-29 17:43:24 +00:00
Jakub Pawlowski
76bb514c78 Merge "BLE: Add service solicitation uuid feature in scan filter" am: 13d6540956 
am: 253403081a

Change-Id: Id401c429b4a95a92cf25dd3eec073b3b3fbf84a9
 2018-08-29 04:45:33 -07:00
Jakub Pawlowski
253403081a Merge "BLE: Add service solicitation uuid feature in scan filter" 
am: 13d6540956

Change-Id: I1a708d573b412bd556912b163d99f774bbef05b4
 2018-08-29 04:37:54 -07:00
Nitin Shivpure
1555eae7fa BLE: Add service solicitation uuid feature in scan filter 
Adding service solicitation uuid feature in
scan filter, So BLE Scanner can set scan filter for
advertising packets that includes the Service Solicitation
uuid, which can be one of the below types.
 - List of 16 bit Service UUIDs
 - List of 32 bit Service UUIDs
 - List of 128 bit Service UUIDs

Test: BLE Scanner can do filter scan for advertising packets that
includes the Service Solicitation uuid.

Bug: 78483310
Change-Id: I3d83c50e446fca06a76db002dad716759c145d6e
 2018-08-29 07:40:29 +00:00
Remi NGUYEN VAN
83ac5c5034 Merge "Add global setting to use new DHCPv4 server" am: 64dda3cf18 
am: 0f78680ce2

Change-Id: I1be5693bc3d674b794d8afa763cb27eef2070ec9
 2018-08-28 23:48:48 -07:00
Remi NGUYEN VAN
0f78680ce2 Merge "Add global setting to use new DHCPv4 server" 
am: 64dda3cf18

Change-Id: I3476e8e53247d086ca38e18c8713bb17396c6dfd
 2018-08-28 23:40:02 -07:00
Remi NGUYEN VAN
64dda3cf18 Merge "Add global setting to use new DHCPv4 server" 2018-08-29 06:24:40 +00:00
Remi NGUYEN VAN
cae667c43e Merge "Add DhcpServer" am: e3a0f42e8e 
am: dccc1866de

Change-Id: Ic3b1cd87389ade162c1c7441132f3e0451f1b78c
 2018-08-28 20:42:08 -07:00
Remi NGUYEN VAN
dccc1866de Merge "Add DhcpServer" 
am: e3a0f42e8e

Change-Id: I4ce2cb61d084b37681e1f5103a4e31d4af1cae3e
 2018-08-28 20:32:54 -07:00
Erik Kline
37e01c985d Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f 
am: 0bd9ac4b69

Change-Id: I3199337fd168f58f13a547d4eaff2be069a22f3d
 2018-08-28 20:21:50 -07:00
Remi NGUYEN VAN
e3a0f42e8e Merge "Add DhcpServer" 2018-08-29 03:19:27 +00:00
Erik Kline
0bd9ac4b69 Merge "Remove ResolveUtil from frameworks/base callers" 
am: 0e1621296f

Change-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1
 2018-08-28 20:12:49 -07:00
Treehugger Robot
0e1621296f Merge "Remove ResolveUtil from frameworks/base callers" 2018-08-29 02:58:08 +00:00
Jeff Sharkey
6324854fa0 Merge "Q." am: 20cc0ef048 
am: 4c9108ca39

Change-Id: I6b1a9798e89ae68ce55229576a6eac84773356ce
 2018-08-28 12:56:57 -07:00
Chih-Hung Hsieh
bb2ea09170 Merge "Use multiple patterns and emails in per-file syntax." am: 7dd3f1dca6 
am: bb6b0f578a

Change-Id: I5547ca8887d5d24871af665acb71facc61aafd16
 2018-08-28 12:51:10 -07:00
Jeff Sharkey
4c9108ca39 Merge "Q." 
am: 20cc0ef048

Change-Id: I044403f837d4cfc4d1046357e4286ab95caf9865
 2018-08-28 12:31:07 -07:00
Chih-Hung Hsieh
bb6b0f578a Merge "Use multiple patterns and emails in per-file syntax." 
am: 7dd3f1dca6

Change-Id: Ie42e3a24b72c7177fe03a7f14bc346e19fa83932
 2018-08-28 12:26:32 -07:00
Treehugger Robot
20cc0ef048 Merge "Q." 2018-08-28 18:40:11 +00:00
Treehugger Robot
7dd3f1dca6 Merge "Use multiple patterns and emails in per-file syntax." 2018-08-28 18:28:23 +00:00
Jeff Sharkey
5c877634ae Q. 
Clean cherry-pick of ag/4057716.

Bug: 77588754
Test: builds, boots
Change-Id: Ib1d993fe2949f480a350acfa7e2b3cfdc7abd257
Merged-In: Ib1d993fe2949f480a350acfa7e2b3cfdc7abd257
 2018-08-28 17:51:35 +00:00
Mathew Inwood
413ad6c727 Merge "Add <p> to UnsupportedAppUsage javadoc." am: dfd7bc77c3 
am: 5e99817407

Change-Id: I1adcdf43489bfc1889b297e298c88fe2d814f65f
 2018-08-28 09:10:24 -07:00
Mathew Inwood
5ac02a500a Merge "Add myself as OWNERS for UnsupportedAppUsage.java." am: 0589adc790 
am: 48ae9cdf62

Change-Id: I21da319868587babe1c1624c9d29c36d890758b2
 2018-08-28 08:58:20 -07:00
Mathew Inwood
5e99817407 Merge "Add <p> to UnsupportedAppUsage javadoc." 
am: dfd7bc77c3

Change-Id: I7e9c71304d072d0883b004760d489637a1ff4b96
 2018-08-28 08:54:05 -07:00
Mathew Inwood
48ae9cdf62 Merge "Add myself as OWNERS for UnsupportedAppUsage.java." 
am: 0589adc790

Change-Id: I063c30a288ea9da59cfe4a55be3e6d63ee573a1f
 2018-08-28 08:50:00 -07:00
Treehugger Robot
dfd7bc77c3 Merge "Add <p> to UnsupportedAppUsage javadoc." 2018-08-28 15:30:29 +00:00
Treehugger Robot
0589adc790 Merge "Add myself as OWNERS for UnsupportedAppUsage.java." 2018-08-28 15:24:23 +00:00
Mathew Inwood
8ea8654bae Add <p> to UnsupportedAppUsage javadoc. 
To make HTML rendering of it readable.

Test: m
Change-Id: Ie829b422d6d905f44a909e4a402b61169268e940
 2018-08-28 10:52:51 +01:00
Remi NGUYEN VAN
0597453f7c Add global setting to use new DHCPv4 server 
The setting applies to the choice of DHCPv4 server for tethering.

Bug: b/109584964
Test: Still builds, SettingsBackupTest passes
Change-Id: Id9b5820883eaf3148f09ad948c34795b3619a30e
 2018-08-28 17:47:04 +09:00
Erik Kline
f4fa982339 Remove ResolveUtil from frameworks/base callers 
Use the Private DNS bypass logic that was moved into Network.

Once all callers of ResolvUtil are updated to use this interface
ResolvUtil can be deleted.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connection to captive portal network detects portal correctly
      and the login activity functions as expected

Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Change-Id: If11ef2b5ffdc729f8449cf18dccd5f1eccbc51e6
 2018-08-28 12:59:21 +09:00
Remi NGUYEN VAN
a13007ad0f Add DhcpServer 
This first version can serve discover/request/release, although there
are some small behavior changes with current implementation which will
be addressed later.

Also removes final modifiers on start() and stop() in FdEventsReader, to
allow mocking the methods in tests with the current mockito lib.

Test: Added tests pass, manual: flashed a device using the server
Change-Id: I025366ff7d51c4ba31152af50f3dd2b5e280a54d
 2018-08-28 12:50:47 +09:00
Makoto Onuki
8fd96af2b1 Merge "Fix OWNERS (change google.com to android.com)" am: 7a8e363c0b 
am: 906a31f49f

Change-Id: Ie5089669974c9e9e9c99525c50eddaef6f479874
 2018-08-25 23:23:37 -07:00
Makoto Onuki
906a31f49f Merge "Fix OWNERS (change google.com to android.com)" 
am: 7a8e363c0b

Change-Id: Ic3e8861a95ac025d1ff6f68943ef460b94d3c501
 2018-08-25 23:11:13 -07:00
Makoto Onuki
d52f363924 Merge "Actually make OWNERS in sync with the internal version" am: 7e54042f9c 
am: 83c37379da

Change-Id: I1bbd7ccc7b610d9cbdcf9f7f8f52b734679766cd
 2018-08-24 15:17:22 -07:00
Makoto Onuki
83c37379da Merge "Actually make OWNERS in sync with the internal version" 
am: 7e54042f9c

Change-Id: Id6f2551434279d9d5be0c0cb2c72d59393bd4095
 2018-08-24 15:08:00 -07:00
Makoto Onuki
1fda56bbda Fix OWNERS (change google.com to android.com) 
Bug: N/A
Test: N/A
Change-Id: I9a9eecfff1a72d7da55be0df73f29985b19c1e38
 2018-08-24 14:58:42 -07:00
Makoto Onuki
7e54042f9c Merge "Actually make OWNERS in sync with the internal version" 2018-08-24 21:56:34 +00:00
Chih-hung Hsieh
26b072d20d Merge "Use multiple patterns and emails in per-file syntax." am: 62d0edc6ef 
am: f16ded6120

Change-Id: I76a342fdc7097ba5941f78873145999612379e6c
 2018-08-24 13:13:34 -07:00
Chih-hung Hsieh
f16ded6120 Merge "Use multiple patterns and emails in per-file syntax." 
am: 62d0edc6ef

Change-Id: I15a2aaf9dd002f1164146d81e8adbbe2bca74231
 2018-08-24 12:48:10 -07:00
Makoto Onuki
83c1a68491 Actually make OWNERS in sync with the internal version 
Bug: N/A
Test: N/A
Change-Id: Idc1dcc7753a5cf731475ae0f8f01ccd54ac0e3b3
 2018-08-24 12:47:20 -07:00