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

314937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etan Cohen
c1b654a09e [CM] Unhide the NetworkSpecifier as object API 
API visibility change: unhide allowing NetworkSpecifier
to be an arbitrary object.

Bug: 27533960
Bug: 36053921
Bug: 36275276
Test: builds and runs
Change-Id: I1d1705cca7ece077ef8d7c674c62d5369fedbb03
Merged-In: I7535495681da8f168c46d6d95e13925cffecc99b
Merged-In: I6500639ae839ee9ad5af34d1292d1539c943e2ad
 2017-04-14 18:23:45 +09:00
Etan Cohen
29fe0c9930 Make the NetworkSpecifier a class instead of a string. 
Bug: 27533960
Bug: 36053921
Bug: 36275276
Test: connectivity, wifi, telephony unit tests
Change-Id: Idd9b10a8418c53c8cf386d9ff8252226b076bbf9
Merged-In: I7535495681da8f168c46d6d95e13925cffecc99b
Merged-In: I6500639ae839ee9ad5af34d1292d1539c943e2ad
 2017-04-14 18:22:10 +09:00
Lorenzo Colitti
677999af11 Add test coverage for NetworkSpecifiers. 
Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.

Test: ConnectivityServiceTest passes
Bug: 27533960
Bug: 36053921
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0
Merged-In: Ia7d36096f0e3f0b203d1d838043c03fcd1cea829
Merged-In: Ia71b72cc10dba6bac7c8fbe1ab3c5f40bc5506ff
 2017-04-14 18:20:59 +09:00
Jaewan Kim
aceef91980 MediaSessionService: Cache active sessions per an user 
This fixes an issue that MediaSessionManager.getActiveSessions() may
return media sessions of the wrong user. This had been an issue since
the Android M.

Bug: 36227938
Test: Run the CtsMediaTest (MediaSessionTest and MediaSessionManagerTest)
  and CtsMediaHostTestCases
Change-Id: I8a8297e4d182f52c84f654bdb0ba78bc16a1c058
 2017-04-14 18:07:03 +09:00
Hugo Benichi
35025da669 Captive portal: rotate fallback urls 
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Merged-In: I3c010bfee5b99db03a500776fbf47959a29d0578

(cherry picked from commit eef918a66c984ac7bb1f541665f4dc9bb88ea7ac)

Change-Id: If4d9a091c3a04a33895032d9b0d05c1dc66968e7
 2017-04-14 08:16:37 +00:00
Svet Ganov
3de36a3cc1 Add back an id used by CTS 
Test: tests can find the autofill dropdown

Change-Id: I4361960b4a12e02b06cca1e3112e4679cd6e484d
 2017-04-14 08:02:33 +00:00
Casey Burkhardt
549a439b53 Merge "Icon assets for magnification" into oc-dev 
am: 4d386d5ce7

Change-Id: I2d75a1bdbaff4ec53b7c7a903374932e092de2cf
 2017-04-14 07:48:19 +00:00
Jakub Pawlowski
ed6ce8637b Bluetooth 5 PHY simplification 
am: a51513747a

Change-Id: I01dc8b494069bb8a1c19ac6ba8aefb5029b991b3
 2017-04-14 07:47:10 +00:00
TreeHugger Robot
4d386d5ce7 Merge "Icon assets for magnification" into oc-dev 2017-04-14 07:41:40 +00:00
Jakub Pawlowski
a51513747a Bluetooth 5 PHY simplification 
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.

This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.

Bug: 30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
(cherry picked from commit 9e377194e35c0fb9ac5771f5658c095ed97e0838)
 2017-04-14 07:33:55 +00:00
Hugo Benichi
43cdbc943d Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 
am: 4479901ff3

Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
 2017-04-14 07:07:46 +00:00
Hugo Benichi
4479901ff3 Merge "Captive portal: rotate fallback urls" am: 76b3537dfd 
am: 605eafe0a5

Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
 2017-04-14 07:00:41 +00:00
Hugo Benichi
605eafe0a5 Merge "Captive portal: rotate fallback urls" 
am: 76b3537dfd

Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
 2017-04-14 06:54:10 +00:00
Treehugger Robot
76b3537dfd Merge "Captive portal: rotate fallback urls" 2017-04-14 06:41:08 +00:00
Jorim Jaggi
5cf511907d Merge "Make sure theme attributes don't get lost" into oc-dev 
am: 9d2f03ec5d

Change-Id: I4a2d163e18ce899eb97bfcff7c92de3a7ffb186c
 2017-04-14 05:34:38 +00:00
TreeHugger Robot
9d2f03ec5d Merge "Make sure theme attributes don't get lost" into oc-dev 2017-04-14 05:24:45 +00:00
Winson Chung
3a32d35723 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 
am: 2e86be7653

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
 2017-04-14 05:22:04 +00:00
Romain Guy
299ae2f422 Merge "Fix javadoc typos" into oc-dev 
am: 4b6e82d237

Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee
 2017-04-14 05:20:55 +00:00
Andrii Kulian
aa412973d9 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 
am: c66b6ff997

Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
 2017-04-14 05:17:33 +00:00
Winson Chung
2e86be7653 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 2017-04-14 05:12:54 +00:00
TreeHugger Robot
4b6e82d237 Merge "Fix javadoc typos" into oc-dev 2017-04-14 05:06:43 +00:00
Andrii Kulian
c66b6ff997 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 2017-04-14 05:05:25 +00:00
Jesse Evans
783026710d Merge "Fix instant app filtering in ApplicationsState" into oc-dev 
am: 9bdaa9c9fa

Change-Id: I1f3b4dfe6c6f9f53c9af5483ab4b31726026d219
 2017-04-14 04:56:33 +00:00
Winson Chung
7031cdda50 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev 
am: 4191d99614

Change-Id: I257467c0f950af3a1b27bbff21e466323babe513
 2017-04-14 04:50:03 +00:00
TreeHugger Robot
9bdaa9c9fa Merge "Fix instant app filtering in ApplicationsState" into oc-dev 2017-04-14 04:49:43 +00:00
TreeHugger Robot
4191d99614 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev 
* changes:
  Fixing missing movement bounds notification to SystemUI.
  Fixing animating bounds regression.
  Tightening up rotation behavior for PIP (2/3)
  Tightening up rotation behavior for PIP (1/3)
 2017-04-14 04:39:01 +00:00
Svet Ganov
489cef380a Merge "Allow custom buttons in autofill UI" into oc-dev 
am: 249c4d709a

Change-Id: I25d94fe03626642ee8f456a78cfb502e1ca53b55
 2017-04-14 04:36:40 +00:00
Android Build Merger (Role)
0bf753d2e5 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 2017-04-14 04:34:25 +00:00
Dmitry Dementyev
11e1805ab3 Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev 
am: 2a30085e5c

Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
 2017-04-14 04:33:27 +00:00
Android Build Merger (Role)
562e577b1c Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am: 0e8090b10e" into oc-dev-plus-aosp 2017-04-14 04:33:07 +00:00
Hugo Benichi
ed1e91e4f4 Merge changes Id0d536ff,I4fcd0ad7 into oc-dev 
am: 0e8090b10e

Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc
 2017-04-14 04:32:17 +00:00
Android Build Merger (Role)
224b710a4f Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am: f5d5e5e4bf" into oc-dev-plus-aosp 2017-04-14 04:31:49 +00:00
Jeff Sharkey
4e544771dd Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev 
am: f5d5e5e4bf

Change-Id: I2af664620bdaf6fa4551aade80e56decf0995838
 2017-04-14 04:30:50 +00:00
Android Build Merger (Role)
e9277ebe4a Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am: 4cae059bb9" into oc-dev-plus-aosp 2017-04-14 04:30:29 +00:00
Romain Guy
c20a2aaa08 Merge "Add more doc to ColorSpace.getName()" into oc-dev 
am: 4cae059bb9

Change-Id: If6674f4884a8d0e4c36072125cbcc7895a49abe5
 2017-04-14 04:29:39 +00:00
Android Build Merger (Role)
c1c3855397 Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am: 59047acea7" into oc-dev-plus-aosp 2017-04-14 04:29:20 +00:00
Christopher Tate
637c5b11a3 Merge "Turn down dynamic toggle for background restriction policy" into oc-dev 
am: 59047acea7

Change-Id: Ibd345b735d1743f2c253bc0d0937a44573343dd0
 2017-04-14 04:28:31 +00:00
Android Build Merger (Role)
900f022984 Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am: 59c124b755" into oc-dev-plus-aosp 2017-04-14 04:28:11 +00:00
Mady Mellor
65aed22863 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 
am: 59c124b755

Change-Id: I38781516da59f84f829699e2ef9c1db27e7578b6
 2017-04-14 04:27:08 +00:00
Android Build Merger (Role)
37933ae25b Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp 2017-04-14 04:26:48 +00:00
Svet Ganov
162a93ca1c Check for non-null parent before delegating to it 
am: 3a74243ae4

Change-Id: I294345cde604bf61175297ceb5ab11d23dbf6eb7
 2017-04-14 04:26:02 +00:00
Rebecca Silberstein
01d3ad5cf2 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613 
am: 2f7a169618

Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
 2017-04-14 04:25:57 +00:00
TreeHugger Robot
249c4d709a Merge "Allow custom buttons in autofill UI" into oc-dev 2017-04-14 04:22:10 +00:00
Rebecca Silberstein
2f7a169618 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 
am: 6fc5051613

Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
 2017-04-14 04:19:02 +00:00
Andreas Huber
71a840befa Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 
am: 9b2ed2b7c4

Change-Id: Ibc670da31571add92a312b7673be376be67f9072
 2017-04-14 04:17:37 +00:00
Roozbeh Pournader
b9e8d31eca Merge "Add Adlam font to fonts.xml" into oc-dev 
am: 1ad7ff32b1

Change-Id: Ic5244c47a1d31e75df484decc65195fd381bf8b5
 2017-04-14 04:14:25 +00:00
Yifan Hong
38bf613c0f Merge "Add Java API for libvintf." into oc-dev 
am: c223d70e64

Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
 2017-04-14 04:13:04 +00:00
Rebecca Silberstein
6fc5051613 Merge "Add a default SSID prefix for local only hotspot" 
am: e98a2942a4

Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
 2017-04-14 04:12:34 +00:00
Ta-wei Yen
63668e4396 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 
am: ad989b1711

Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
 2017-04-14 04:11:29 +00:00
Rebecca Silberstein
e98a2942a4 Merge "Add a default SSID prefix for local only hotspot" 2017-04-14 04:03:50 +00:00