OSDN Git Service
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
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
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
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
John Reck [Fri, 28 Oct 2016 19:38:42 +0000 (19:38 +0000)]
Merge "Add SurfaceHolder#lockHardwareCanvas()"
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>"
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)]
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
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
Michael Kwan [Thu, 27 Oct 2016 20:28:50 +0000 (20:28 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am:
07192ff60a am:
4e830d259a
am:
bf6a177198
Change-Id: I09aba54f0d3bfc17861ccef2aba836751af7adb0
Jeff Sharkey [Thu, 27 Oct 2016 20:28:44 +0000 (20:28 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221
am:
32dcd2cad4
Change-Id: Iebf13cac5308c3763c90219407437a5d010cd27e
Michael Kwan [Thu, 27 Oct 2016 20:27:56 +0000 (20:27 +0000)]
Update progress bar and progress dialog to match UX specs for watch. am:
f930e5b99b am:
c8eb232ba3
am:
05aed4e0cd
Change-Id: Ibdb760acf53a302db8060b78d98cb48dbca0874b
Jeff Sharkey [Thu, 27 Oct 2016 20:27:54 +0000 (20:27 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d
am:
eeac5a064d
Change-Id: If0fcf46d1f73662dbc774403e8d9be62585ef4a5
Jeff Sharkey [Thu, 27 Oct 2016 20:23:26 +0000 (20:23 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev
am:
286f069221
Change-Id: Ie24d27d010b355896e92b911d574576f42417b9b
Jeff Sharkey [Thu, 27 Oct 2016 20:23:23 +0000 (20:23 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once.
am:
7765d7320d
Change-Id: I2ca3b6d7938a461a6fe2d591b74985908c2d07bc
Michael Kwan [Thu, 27 Oct 2016 20:20:07 +0000 (20:20 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am:
07192ff60a
am:
4e830d259a
Change-Id: Iaaa3618b497ec0d547f83e3b5677fd322f7015b3
Michael Kwan [Thu, 27 Oct 2016 20:19:03 +0000 (20:19 +0000)]
Update progress bar and progress dialog to match UX specs for watch. am:
f930e5b99b
am:
c8eb232ba3
Change-Id: I56297d399965b2b03dc41b2cc9d6237c7762c03f
Jeff Sharkey [Thu, 27 Oct 2016 20:18:19 +0000 (20:18 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once."
Jeff Sharkey [Thu, 27 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev
Michael Kwan [Thu, 27 Oct 2016 20:14:07 +0000 (20:14 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev
am:
07192ff60a
Change-Id: I31c220c68e142cb15b7e6801a88a1aff853229b2
Michael Kwan [Thu, 27 Oct 2016 20:13:59 +0000 (20:13 +0000)]
Update progress bar and progress dialog to match UX specs for watch.
am:
f930e5b99b
Change-Id: I5123bba1819fe4841184bcab9cc65d0418c3b2a5
TreeHugger Robot [Thu, 27 Oct 2016 20:06:15 +0000 (20:06 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev
TreeHugger Robot [Thu, 27 Oct 2016 19:42:13 +0000 (19:42 +0000)]
Merge "Log removeUser"
Sudheer Shanka [Wed, 19 Oct 2016 00:15:18 +0000 (17:15 -0700)]
Move IMountService to aidl.
Bug:
30977067
Test: Existing tests passing.
Change-Id: Icadfdcbc79708d3826b4e11afe35f5963aabcd4c
Rob Carr [Thu, 27 Oct 2016 19:26:01 +0000 (19:26 +0000)]
Merge "Disable seamless rotation when nav bar jumps."
TreeHugger Robot [Thu, 27 Oct 2016 19:09:23 +0000 (19:09 +0000)]
Merge "Dumps total size of primary storage."
TreeHugger Robot [Thu, 27 Oct 2016 18:41:30 +0000 (18:41 +0000)]
Merge changes from topic 'always_on'
* changes:
AmbientDisplay: Fixed threading
AmbientDisplay: Factor out DozeSensors
Fyodor Kupolov [Thu, 27 Oct 2016 18:21:47 +0000 (18:21 +0000)]
Merge "Use app context to avoid memory leaks"
Fyodor Kupolov [Thu, 27 Oct 2016 18:00:29 +0000 (11:00 -0700)]
Log removeUser
Test: manual
Bug:
32455935
Change-Id: If1756725a428278ec21aa4d2cccce0da6079c22b
TreeHugger Robot [Thu, 27 Oct 2016 17:54:59 +0000 (17:54 +0000)]
Merge "Fix hide fragment transition"
Leonard Mosescu [Thu, 27 Oct 2016 17:50:33 +0000 (17:50 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master am:
258790a2ea am:
df87eb4adc
am:
c41f617dec
Change-Id: I09f88b45fd4deea370246dc74465a3db702d8078
Leonard Mosescu [Thu, 27 Oct 2016 17:49:32 +0000 (17:49 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours am:
d73688521c am:
8d0cdfb291
am:
b9b149d9dd
Change-Id: I7335d4314f32a709dfc055964d3a9f3869bd8b7e
Michal Karpinski [Thu, 27 Oct 2016 17:48:27 +0000 (17:48 +0000)]
Extending DNS event reporting am:
6e54239e50 am:
8c32fd2d33
am:
9351835591
Change-Id: Id482e6a300de49cc1d37ec6e38b9c651ec671f3e
TreeHugger Robot [Thu, 27 Oct 2016 17:45:11 +0000 (17:45 +0000)]
Merge "Move SkMovie into frameworks/base"
OSDN Git Service
