Commit Graph

301953 Commits

Author SHA1 Message Date
Lorenzo Colitti
ecc986d430 Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS
Change-Id: I4b389f7f4e33a996885b38670f585e58ca66f777
2016-10-28 17:12:36 +09:00
Lorenzo Colitti
281a17c958 De-guava BroadcastInterceptingContext and move it to testutils.
Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.

Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.

Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest  # Already failing.
Bug: 31479480
Change-Id: Ifab32c9214e9caab71dbf93b3d3ca88df6f49636
2016-10-28 17:12:36 +09:00
Lorenzo Colitti
7df1a82802 Move FakeSettingsProvider to a common location.
Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug: 31479480
Change-Id: I82a1a1a7219cf1385092b84d85eddf9dda90c685
2016-10-28 17:12:31 +09:00
Mitchell Wills
ffba771b43 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am: a657136264
am: 010384868d  -s ours

Change-Id: I7fd1ad68d334a4353e481e0df85783e142a12341
2016-10-28 06:40:01 +00:00
Mitchell Wills
038284856d Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am: 3d4833bfb8  -s ours

Change-Id: Ib5d327f4b550cab2d5a5f9c6837e8af3bb7f1d05
2016-10-28 06:35:39 +00:00
Mitchell Wills
010384868d Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am: a657136264

Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
2016-10-28 06:35:28 +00:00
Mitchell Wills
3d4833bfb8 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit 6a80a4b05a.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128b)
2016-10-28 06:20:34 +00:00
Mitchell Wills
a657136264 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit 6a80a4b05a.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128b)
2016-10-28 06:19:56 +00:00
Mitchell Wills
d28137e0b7 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am: 77281bbaf4 -s ours am: e1d1740534
am: f452432e2c  -s ours

Change-Id: I5c5d121e13a755bc58962a428ee9885ac63ff8d9
2016-10-28 05:09:28 +00:00
Mitchell Wills
f452432e2c Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am: 77281bbaf4 -s ours
am: e1d1740534

Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
2016-10-28 05:04:31 +00:00
Mitchell Wills
e1d1740534 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am: 77281bbaf4  -s ours

Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
2016-10-28 04:58:50 +00:00
Mitchell Wills
77281bbaf4 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit 6a80a4b05a.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128b)
2016-10-28 03:52:58 +00:00
Jakub Pawlowski
d649849928 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6 am: 61d0088923
am: e582ab854d

Change-Id: Ibbf57cfccad50ae5d7dd9f80a13f08c5cfd1623e
2016-10-28 03:24:38 +00:00
Marie Janssen
e70595b9fe Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours am: 98f664b903 am: 7ad32238f6
am: 41319ff65f

Change-Id: I810a42d85002b0fe40c005f2065b2e701ea8c5cf
2016-10-28 03:22:36 +00:00
Jakub Pawlowski
e582ab854d Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6
am: 61d0088923

Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
2016-10-28 03:01:56 +00:00
Jakub Pawlowski
61d0088923 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21
am: 81d5ecb7a6

Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
2016-10-28 02:56:54 +00:00
Marie Janssen
41319ff65f Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours am: 98f664b903
am: 7ad32238f6

Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
2016-10-28 02:56:54 +00:00
Marie Janssen
7ad32238f6 Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours
am: 98f664b903

Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
2016-10-28 02:52:00 +00:00
Jakub Pawlowski
81d5ecb7a6 Merge "Separate LE scanner from GATT client (1/4)"
am: 87c997ca21

Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
2016-10-28 02:50:54 +00:00
Marie Janssen
98f664b903 Merge "Add Bluetooth toggle prompts - framework"
am: a062ce698b  -s ours

Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
2016-10-28 02:45:26 +00:00
Tomasz Mikolajewski
5a5c44a2e3 Add support for opening JAR/ZIP files via FD.
Test: Upcoming change in DocumentsUI uses this feature.
Bug: 31783726
Change-Id: Ia74e9bdb66722dfb2855380375a99cc94d288b2e
2016-10-28 11:23:20 +09:00
Julius D'souza
5d7170963a Add initial ambient light sensor rate
Bug: 32153559
Test: Existing tests pass.

Change-Id: Ic54bded46f88991290ed1e4d2574f865b6f598ec
2016-10-27 19:01:08 -07:00
Sergei Vasilinetc
fda66672fe Merge changes I94b1c31c,Ib0b16c87
* changes:
  Add target to texture
  Use Bitmap in Texture.upload
2016-10-28 01:31:00 +00:00
Sudheer Shanka
ea8e738b3e Remove ApplicationThreadNative from preloaded/compiled-classes.
And add IApplicationThread$Stub and IApplicationThread$Stub$Proxy.

Bug: 30977067
Test: N/A
Change-Id: I86f9517ac25bf68320e94524c617b101e5bbb80c
2016-10-27 18:19:45 -07:00
Adam Lesinski
c0c366394c Add font type to AAPT2
Test: make libaapt2_tests AaptTestAppOne
Change-Id: I8fbf01675a218cc3c0b59598b6b1ec173851e946
2016-10-27 18:09:00 -07:00
TreeHugger Robot
42875e6cf6 Merge "Perform onDestroy when FragmentController is torn down." 2016-10-28 00:52:32 +00:00
Fyodor Kupolov
123e921333 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 am: 74bd9b1f56 am: 9b006e28f9
am: 8b44db55d3  -s ours

Change-Id: I6c478eea6884184098c783eea507ece48f54bee6
2016-10-28 00:49:18 +00:00
Fyodor Kupolov
7d53a05876 [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d am: c9102f2ae2
am: f4fba91b5f  -s ours

Change-Id: Id759489caebf38b93bda790e8d36827d6635aac4
2016-10-28 00:48:18 +00:00
Fyodor Kupolov
8b44db55d3 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 am: 74bd9b1f56
am: 9b006e28f9

Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
2016-10-28 00:40:22 +00:00
Fyodor Kupolov
f4fba91b5f [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d
am: c9102f2ae2

Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
2016-10-28 00:39:12 +00:00
Fyodor Kupolov
9b006e28f9 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0
am: 74bd9b1f56

Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
2016-10-28 00:31:47 +00:00
Fyodor Kupolov
c9102f2ae2 [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6
am: 7c9a91094d

Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
2016-10-28 00:30:43 +00:00
Fyodor Kupolov
74bd9b1f56 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
am: e97969b4d0

Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
2016-10-28 00:21:12 +00:00
Fyodor Kupolov
7c9a91094d [DO NOT MERGE] Only setSize if -s arg is specified
am: b87a491de6

Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
2016-10-28 00:21:10 +00:00
TreeHugger Robot
e97969b4d0 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev 2016-10-28 00:11:14 +00:00
TreeHugger Robot
9212fc742f Merge "Correctly use ByteBuffer in UsbRequest" 2016-10-27 23:47:32 +00:00
Adam Lesinski
e343eb145c AAPT2: Insert <uses-sdk> element before <application>
PackageParser on the device uses the targetSdkVersion of the
app while it parses <application>. That means that if the
<uses-sdk> tag comes after <application>, the targetSdkVersion
is assumed to be 0.

Test: make libaapt2_tests
Change-Id: I60f2179a7ff44e7419217afb53f3d24f8c030f6e
2016-10-27 16:31:58 -07:00
Jakub Pawlowski
87c997ca21 Merge "Separate LE scanner from GATT client (1/4)" 2016-10-27 23:18:54 +00:00
Brad Ebinger
3445f82907 Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
2016-10-27 16:11:18 -07:00
Jakub Pawlowski
1b49e6eb04 Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
2016-10-27 23:09:35 +00:00
Marie Janssen
a062ce698b Merge "Add Bluetooth toggle prompts - framework" 2016-10-27 23:07:32 +00:00
Svetoslav Ganov
f9e2ad0b3c Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit ac69be543f)
2016-10-27 22:49:11 +00:00
Sudheer Shanka
428868c1f0 Merge "Move IMountService to aidl." 2016-10-27 22:38:34 +00:00
Fyodor Kupolov
b87a491de6 [DO NOT MERGE] Only setSize if -s arg is specified
Calculate size of installed APKs only when INSTALL_EXTERNAL flag is set.
calculateInstalledSize is expensive and may take up to 20% of total
installation time.

Bug: 32180551
Bug: 29932779
Change-Id: I173d2b38820cc86cbfacecd1bacef57369d10af7
2016-10-27 15:29:41 -07:00
Robert Carr
0f5d753972 Allow specifying rotation animation in manifest.
In the case where activity launching may trigger orientation
changes we may wish to run the rotation animation with a starting
window, in which case the app won't have had time to set the
rotation animation on the window yet, so we desire a way to
specify it for the whole activity.

Test: Run RotationAnimation activity from API Demos and verify default animation is crossfade
Bug: 29940147
Change-Id: I5deae6c6a32ee51a0a5409d38f0e5d15ca464a1b
2016-10-27 22:08:11 +00:00
George Mount
851179dbec Perform onDestroy when FragmentController is torn down.
Bug 32457575

Test: I9e33801c34bcb31e3d6ca0df3962cfe1a3203044
Change-Id: Id220dbfb3e42d2c91b99926c1e9b0c556c9b453a
2016-10-27 14:24:58 -07:00
John Reck
6bc7014210 Add SurfaceHolder#lockHardwareCanvas()
Bug: 26988043
Test: SurfaceViewTests#testSurfaceHolderHardwareCanvas CTS test
Change-Id: I3e5352d498dbe2fc56a18ca27360d129a14c7784
2016-10-27 14:13:44 -07:00
Jeff Sharkey
d50ac51658 Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am: 286f069221 am: 32dcd2cad4 am: 99bfb0dcaa
am: 4c7a2fac3b

Change-Id: I2cc189e52cf8bdd4b8d92e2a347cc0fea24dc433
2016-10-27 20:48:46 +00:00
Jeff Sharkey
954f0a1f1b Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am: 7765d7320d am: eeac5a064d am: f46b2eeab6
am: ed8259f3fd

Change-Id: Ide6ce44649aba7eea6d0a3395d2e21e00fff2d07
2016-10-27 20:47:49 +00:00
Jeff Sharkey
4c7a2fac3b Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am: 286f069221 am: 32dcd2cad4
am: 99bfb0dcaa

Change-Id: I24fd77665875ef2f7e2ad231c7de8acabc40a99a
2016-10-27 20:38:54 +00:00