OSDN Git Service
Tony Mak [Wed, 2 Nov 2016 10:26:45 +0000 (10:26 +0000)]
Cross profile candidate should be considered
Bug:
32547783
Fixed the regression introduced in ag/
1243573
Test: Manual test - Open a map link in work calendar, personal map is shown as an option.
Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
Nicolas Prévot [Mon, 31 Oct 2016 11:23:23 +0000 (11:23 +0000)]
Merge "Allow DO to remove user even if DISALLOW_REMOVE_USER is set."
Tomasz Mikolajewski [Mon, 31 Oct 2016 05:55:51 +0000 (05:55 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
Lorenzo Colitti [Mon, 31 Oct 2016 04:16:48 +0000 (04:16 +0000)]
Merge changes from topic 'frameworks-net-tests'
* changes:
Move the connectivity tests to frameworks/base/tests/net.
De-guava BroadcastInterceptingContext and move it to testutils.
Move FakeSettingsProvider to a common location.
TreeHugger Robot [Sat, 29 Oct 2016 01:36:13 +0000 (01:36 +0000)]
Merge "Iteration on findPath API. Address Jeff's comment in ag/
1542773."
Dianne Hackborn [Fri, 28 Oct 2016 23:53:31 +0000 (23:53 +0000)]
Merge "Power manager now prevents wake locks from idle uids."
TreeHugger Robot [Fri, 28 Oct 2016 23:53:19 +0000 (23:53 +0000)]
Merge "Add FragmentLifecycleCallbacks"
Garfield Tan [Wed, 26 Oct 2016 21:52:46 +0000 (14:52 -0700)]
Iteration on findPath API. Address Jeff's comment in ag/
1542773.
* Add @Nullable to rootId in Path constructor.
* Erase rootId if findPath() doesn't return null rootId.
* Use Log.wtf() instead of throwing.
Bug:
30948740
Change-Id: I38354c5ac49aaa7e31a3ae56cd3379ffb19918c9
(Cherry picked from commit
04fdf6e18c97c2bf6ed58f8de9ba6723fa8c1613)
Adam Powell [Fri, 28 Oct 2016 17:24:40 +0000 (10:24 -0700)]
Add FragmentLifecycleCallbacks
Add a new callback object that can be attached to a FragmentManager to
observe all fragment lifecycle events within that
FragmentManager. Useful for dependency injection and other
shenanigans.
FragmentLifecycleCallbacks can be registered as recursive, in which
case they will be activated for any lifecycle events that happen in
descendant FragmentManagers as well.
Test: cts-tradefed run singleCommand cts --skip-preconditions --skip-device-info --module CtsFragmentTestCases
Change-Id: I816b1fbef6c29616ccc3fd729ee847c5f1a6f72f
TreeHugger Robot [Fri, 28 Oct 2016 21:52:14 +0000 (21:52 +0000)]
Merge "Add windows to window tokens in expected z-order"
TreeHugger Robot [Fri, 28 Oct 2016 21:36:01 +0000 (21:36 +0000)]
Merge "vibrator: Remove unused using statement."
Sanket Agarwal [Fri, 28 Oct 2016 20:49:57 +0000 (20:49 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533 am:
958dab93cd am:
9527a19cbc
am:
6b2b2a87f9
Change-Id: I48705f864b31912538bfc8fdd6ca3749c11becb7
Brad Ebinger [Fri, 28 Oct 2016 20:37:18 +0000 (20:37 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am:
aacbdf59d6 am:
ccd8315969
am:
5cf582e74d
Change-Id: I348de54b56282d3a88e03671e2816425b953972b
Brad Ebinger [Fri, 28 Oct 2016 20:36:01 +0000 (20:36 +0000)]
Modify AIDLs to include Session.Info am:
b32d4f8b5c am:
668a6fa227
am:
e3f387fe3a
Change-Id: Ief110680037a71d2385fa46c33983887104b4caf
Sanket Agarwal [Fri, 28 Oct 2016 20:28:50 +0000 (20:28 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533 am:
958dab93cd
am:
9527a19cbc
Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad
Brad Ebinger [Fri, 28 Oct 2016 20:26:51 +0000 (20:26 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am:
aacbdf59d6
am:
ccd8315969
Change-Id: If1e6819430977bf3978bbbf23f0f32fcb1c460d4
Brad Ebinger [Fri, 28 Oct 2016 20:25:34 +0000 (20:25 +0000)]
Modify AIDLs to include Session.Info am:
b32d4f8b5c
am:
668a6fa227
Change-Id: I7afb3692f4f26c37b96c98d7a1e173576dd7620b
Sanket Agarwal [Fri, 28 Oct 2016 20:19:14 +0000 (20:19 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533
am:
958dab93cd
Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
Derek Sollenberger [Fri, 28 Oct 2016 20:17:53 +0000 (20:17 +0000)]
Merge "Refactor mock Functors into a common TestUtils class."
Brad Ebinger [Fri, 28 Oct 2016 20:17:15 +0000 (20:17 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am:
aacbdf59d6
Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934
Brad Ebinger [Fri, 28 Oct 2016 20:17:03 +0000 (20:17 +0000)]
Modify AIDLs to include Session.Info
am:
b32d4f8b5c
Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
Sanket Agarwal [Fri, 28 Oct 2016 20:13:57 +0000 (20:13 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
am:
678ba24533
Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
Sanket Agarwal [Fri, 28 Oct 2016 20:01:58 +0000 (20:01 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
Wale Ogunwale [Fri, 14 Oct 2016 22:30:09 +0000 (15:30 -0700)]
Add windows to window tokens in expected z-order
Decouple the logic for adding window to a position in the parent
window token from the position we are adding the window to in the
window list. The window token now adds the windows in order based
on the rules the rest of the system is using which makes the code
a little more straightforward to follow.
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Change-Id: Ic9b724fba02279a0c4e92508d39e5e35171b6d8d
John Reck [Fri, 28 Oct 2016 19:38:42 +0000 (19:38 +0000)]
Merge "Add SurfaceHolder#lockHardwareCanvas()"
Steven Moreland [Fri, 28 Oct 2016 19:29:43 +0000 (12:29 -0700)]
vibrator: Remove unused using statement.
Bug:
32313592
Test: compiles
Change-Id: Ia2b99bd0a28653daa61150da022024e21a02a842
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
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
Adam Lesinski [Fri, 28 Oct 2016 18:50:49 +0000 (18:50 +0000)]
Merge "AAPT2: Insert <uses-sdk> element before <application>"
Nicolas Prevot [Tue, 25 Oct 2016 12:57:08 +0000 (13:57 +0100)]
Allow DO to remove user even if DISALLOW_REMOVE_USER is set.
BUG:
32300784
Test: create user in TestDPC, set DISALLOW_REMOVE_USER restriction,
and remove this user.
Change-Id: I96ab02d594cd1a8ab14420e12357f2083da1ce63
Dianne Hackborn [Wed, 26 Oct 2016 00:13:24 +0000 (17:13 -0700)]
Power manager now prevents wake locks from idle uids.
The activity manager now pushes the idle/active state
down in to the power manager. The power manager now
tracks a structure of data about each uid: how many
wake locks it holds, whether it is active, and (as before)
its current process state.
Now when apps are inactive, we always disable wake locks
they hold, regardless of the system's device idle or
other state.
Test: none
Change-Id: I2cd4077e4d8a8572525406ae9747f0a2435764da
Sanket Agarwal [Tue, 28 Jun 2016 03:13:54 +0000 (20:13 -0700)]
Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.
Bug: b/
29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit
dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit
40bb6f3f8fc02600fe24301c11e804196ced3531)
Igor Murashkin [Fri, 28 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555 am:
d0d99d8a3d am:
4aa38633fe
am:
7ab062fd66
Change-Id: I6d093ad8aa1b04d75e6968ebcb9c0fb7376f0811
Igor Murashkin [Fri, 28 Oct 2016 18:00:11 +0000 (18:00 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555 am:
d0d99d8a3d
am:
4aa38633fe
Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3
Derek Sollenberger [Fri, 28 Oct 2016 17:57:14 +0000 (13:57 -0400)]
Refactor mock Functors into a common TestUtils class.
Test: refactor. existing tests still pass
Change-Id: I55258487c371869a5b91dd2dcf6bf7bd47ac1a35
Igor Murashkin [Fri, 28 Oct 2016 17:55:12 +0000 (17:55 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555
am:
d0d99d8a3d
Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
Igor Murashkin [Fri, 28 Oct 2016 17:48:15 +0000 (17:48 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
am:
4a4a8f1555
Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
TreeHugger Robot [Fri, 28 Oct 2016 17:38:22 +0000 (17:38 +0000)]
Merge changes I8673cb95,I2f2a461b
* changes:
Make plugins have an application context
Add system property to not disable plugins on crash
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
Derek Sollenberger [Fri, 28 Oct 2016 17:13:18 +0000 (17:13 +0000)]
Merge changes If99865cd,I5b794c94
* changes:
Fix test breakage due to naming collision in the linker.
Minor cleanup of unused headers and overly described functions.
TreeHugger Robot [Fri, 28 Oct 2016 16:16:01 +0000 (16:16 +0000)]
Merge "Provisioning constants"
Sudheer Shanka [Fri, 28 Oct 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Remove ApplicationThreadNative from preloaded/compiled-classes."
Derek Sollenberger [Fri, 28 Oct 2016 15:08:50 +0000 (11:08 -0400)]
Fix test breakage due to naming collision in the linker.
Test: hwui_unit_tests in question now run successfully.
Change-Id: If99865cd1cfa5c819338d062f5685700380a60a6
Derek Sollenberger [Wed, 26 Oct 2016 16:05:24 +0000 (12:05 -0400)]
Minor cleanup of unused headers and overly described functions.
Test: local compile
Change-Id: I5b794c9473f6d3a9e1d4f9365c951c7ce9dade50
Jason Monk [Wed, 26 Oct 2016 19:23:09 +0000 (15:23 -0400)]
Make plugins have an application context
So things that use them don't crash.
Test: Plugin that uses getApplicationContext
Change-Id: I8673cb95544280f593479b014cd2620c2d02bf80
Jason Monk [Wed, 26 Oct 2016 19:12:23 +0000 (15:12 -0400)]
Add system property to not disable plugins on crash
Should be used only during dev to avoid having to turn crashing
plugins back on constantly.
Test: Manual
Change-Id: I2f2a461bf7aef017781ed3b61fcb216d7e1cbae9
Jason Monk [Wed, 26 Oct 2016 19:05:42 +0000 (15:05 -0400)]
Faster plugin updating from UI control
Send a broadcast back and forth to speed up the rate at which plugins
are enabled or disabled.
Also update make files to handle exclude tests better.
Test: Manual
Change-Id: Ic8f45c663c3a5e5fd4b3e9e2f79480e155845c14
Mahaver Chopra [Wed, 26 Oct 2016 16:16:19 +0000 (17:16 +0100)]
Provisioning constants
Happens once, when the device is provisioned. It shouldn't be more than
10 times in device's life.
Test: NA
Bug:
31425628
Bug:
32438787
Bug:
31423584
Bug:
32439982
Bug:
32474640
Change-Id: Ib69805a2ebae3396968b47ec1f4821b567afa0d7
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:26:14 +0000 (12:26 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88 am:
29d6af7fe7 am:
0cf19a9a27
am:
4ffbf4e72f
Change-Id: Ifa2373f5f98283cf616c9a64be0346f3d7b917e9
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:19:57 +0000 (12:19 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88 am:
29d6af7fe7
am:
0cf19a9a27
Change-Id: I2e87d2f2a7484b6720152083299b1521f9c517bc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:15:19 +0000 (12:15 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88
am:
29d6af7fe7
Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9"
am:
ec3e884e88
Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Lorenzo Colitti [Fri, 28 Oct 2016 03:48:36 +0000 (12:48 +0900)]
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
Lorenzo Colitti [Fri, 28 Oct 2016 03:56:03 +0000 (12:56 +0900)]
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
Lorenzo Colitti [Fri, 28 Oct 2016 03:37:38 +0000 (12:37 +0900)]
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
Mitchell Wills [Fri, 28 Oct 2016 06:40:01 +0000 (06:40 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am:
a657136264
am:
010384868d -s ours
Change-Id: I7fd1ad68d334a4353e481e0df85783e142a12341
Mitchell Wills [Fri, 28 Oct 2016 06:35:39 +0000 (06:35 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
3d4833bfb8 -s ours
Change-Id: Ib5d327f4b550cab2d5a5f9c6837e8af3bb7f1d05
Mitchell Wills [Fri, 28 Oct 2016 06:35:28 +0000 (06:35 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
a657136264
Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Fri, 28 Oct 2016 05:09:28 +0000 (05:09 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am:
77281bbaf4 -s ours am:
e1d1740534
am:
f452432e2c -s ours
Change-Id: I5c5d121e13a755bc58962a428ee9885ac63ff8d9
Mitchell Wills [Fri, 28 Oct 2016 05:04:31 +0000 (05:04 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am:
77281bbaf4 -s ours
am:
e1d1740534
Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
Mitchell Wills [Fri, 28 Oct 2016 04:58:50 +0000 (04:58 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
77281bbaf4 -s ours
Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Jakub Pawlowski [Fri, 28 Oct 2016 03:24:38 +0000 (03:24 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21 am:
81d5ecb7a6 am:
61d0088923
am:
e582ab854d
Change-Id: Ibbf57cfccad50ae5d7dd9f80a13f08c5cfd1623e
Marie Janssen [Fri, 28 Oct 2016 03:22:36 +0000 (03:22 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours am:
98f664b903 am:
7ad32238f6
am:
41319ff65f
Change-Id: I810a42d85002b0fe40c005f2065b2e701ea8c5cf
Jakub Pawlowski [Fri, 28 Oct 2016 03:01:56 +0000 (03:01 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21 am:
81d5ecb7a6
am:
61d0088923
Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
Jakub Pawlowski [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21
am:
81d5ecb7a6
Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
Marie Janssen [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours am:
98f664b903
am:
7ad32238f6
Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
Marie Janssen [Fri, 28 Oct 2016 02:52:00 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours
am:
98f664b903
Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
Jakub Pawlowski [Fri, 28 Oct 2016 02:50:54 +0000 (02:50 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
am:
87c997ca21
Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
Marie Janssen [Fri, 28 Oct 2016 02:45:26 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
am:
a062ce698b -s ours
Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
Tomasz Mikolajewski [Thu, 20 Oct 2016 01:49:53 +0000 (10:49 +0900)]
Add support for opening JAR/ZIP files via FD.
Test: Upcoming change in DocumentsUI uses this feature.
Bug:
31783726
Change-Id: Ia74e9bdb66722dfb2855380375a99cc94d288b2e
Sergei Vasilinetc [Fri, 28 Oct 2016 01:30:56 +0000 (01:30 +0000)]
Merge changes I94b1c31c,Ib0b16c87
* changes:
Add target to texture
Use Bitmap in Texture.upload
Sudheer Shanka [Fri, 28 Oct 2016 00:42:25 +0000 (17:42 -0700)]
Remove ApplicationThreadNative from preloaded/compiled-classes.
And add IApplicationThread$Stub and IApplicationThread$Stub$Proxy.
Bug:
30977067
Test: N/A
Change-Id: I86f9517ac25bf68320e94524c617b101e5bbb80c
TreeHugger Robot [Fri, 28 Oct 2016 00:52:24 +0000 (00:52 +0000)]
Merge "Perform onDestroy when FragmentController is torn down."
Fyodor Kupolov [Fri, 28 Oct 2016 00:49:18 +0000 (00:49 +0000)]
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
Fyodor Kupolov [Fri, 28 Oct 2016 00:48:18 +0000 (00:48 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6 am:
7c9a91094d am:
c9102f2ae2
am:
f4fba91b5f -s ours
Change-Id: Id759489caebf38b93bda790e8d36827d6635aac4
Fyodor Kupolov [Fri, 28 Oct 2016 00:40:22 +0000 (00:40 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0 am:
74bd9b1f56
am:
9b006e28f9
Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
Fyodor Kupolov [Fri, 28 Oct 2016 00:39:12 +0000 (00:39 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6 am:
7c9a91094d
am:
c9102f2ae2
Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
Fyodor Kupolov [Fri, 28 Oct 2016 00:31:47 +0000 (00:31 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0
am:
74bd9b1f56
Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
Fyodor Kupolov [Fri, 28 Oct 2016 00:30:43 +0000 (00:30 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6
am:
7c9a91094d
Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:12 +0000 (00:21 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
am:
e97969b4d0
Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:10 +0000 (00:21 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified
am:
b87a491de6
Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
TreeHugger Robot [Fri, 28 Oct 2016 00:11:11 +0000 (00:11 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 23:47:29 +0000 (23:47 +0000)]
Merge "Correctly use ByteBuffer in UsbRequest"
Adam Lesinski [Thu, 27 Oct 2016 23:31:58 +0000 (16:31 -0700)]
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
Jakub Pawlowski [Thu, 27 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
Jakub Pawlowski [Wed, 26 Oct 2016 20:05:30 +0000 (13:05 -0700)]
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
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
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
ac69be543f89ea6e9a27204492e0a170d9b3450e)
Sudheer Shanka [Thu, 27 Oct 2016 22:38:31 +0000 (22:38 +0000)]
Merge "Move IMountService to aidl."
Fyodor Kupolov [Thu, 27 Oct 2016 01:36:57 +0000 (18:36 -0700)]
[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
George Mount [Thu, 27 Oct 2016 21:22:27 +0000 (14:22 -0700)]
Perform onDestroy when FragmentController is torn down.
Bug
32457575
Test: I9e33801c34bcb31e3d6ca0df3962cfe1a3203044
Change-Id: Id220dbfb3e42d2c91b99926c1e9b0c556c9b453a
John Reck [Wed, 26 Oct 2016 23:49:17 +0000 (16:49 -0700)]
Add SurfaceHolder#lockHardwareCanvas()
Bug:
26988043
Test: SurfaceViewTests#testSurfaceHolderHardwareCanvas CTS test
Change-Id: I3e5352d498dbe2fc56a18ca27360d129a14c7784
Jeff Sharkey [Thu, 27 Oct 2016 20:48:46 +0000 (20:48 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221 am:
32dcd2cad4 am:
99bfb0dcaa
am:
4c7a2fac3b
Change-Id: I2cc189e52cf8bdd4b8d92e2a347cc0fea24dc433
Jeff Sharkey [Thu, 27 Oct 2016 20:47:49 +0000 (20:47 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d am:
eeac5a064d am:
f46b2eeab6
am:
ed8259f3fd
Change-Id: Ide6ce44649aba7eea6d0a3395d2e21e00fff2d07
Jeff Sharkey [Thu, 27 Oct 2016 20:38:54 +0000 (20:38 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221 am:
32dcd2cad4
am:
99bfb0dcaa
Change-Id: I24fd77665875ef2f7e2ad231c7de8acabc40a99a
Jeff Sharkey [Thu, 27 Oct 2016 20:37:32 +0000 (20:37 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d am:
eeac5a064d
am:
f46b2eeab6
Change-Id: If4c4ab8ddd7e15a93de6422d8724077f158b1047
OSDN Git Service
