OSDN Git Service
Shubham Ajmera [Wed, 1 Nov 2017 02:54:34 +0000 (02:54 +0000)]
Merge "Reduce app size by downgrading inactive apps" am:
8bcd66d35f am:
b11556fcf6 -s ours
am:
28ff2fbec5 -s ours
Change-Id: Ib8a3d303bbf4642be30294d27aedf6b053facf92
Stefan Lafon [Wed, 1 Nov 2017 02:44:58 +0000 (02:44 +0000)]
Merge "Generate constants for enum values."
Shubham Ajmera [Wed, 1 Nov 2017 02:41:28 +0000 (02:41 +0000)]
Merge "Reduce app size by downgrading inactive apps" am:
8bcd66d35f
am:
b11556fcf6 -s ours
Change-Id: I3daf016f968eeae3010fcde9d079b7f9ff2d7e48
TreeHugger Robot [Wed, 1 Nov 2017 02:40:45 +0000 (02:40 +0000)]
Merge "Allow managed services on watches"
Shubham Ajmera [Wed, 1 Nov 2017 02:31:46 +0000 (02:31 +0000)]
Merge "Reduce app size by downgrading inactive apps"
am:
8bcd66d35f
Change-Id: I4bfba3f7eb16442a7a69466cf72b22198acde6c4
Treehugger Robot [Wed, 1 Nov 2017 02:19:57 +0000 (02:19 +0000)]
Merge "Reduce app size by downgrading inactive apps"
Andreas Huber [Wed, 1 Nov 2017 01:51:25 +0000 (01:51 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob." am:
a546c38130 am:
33569ca480
am:
4b5806cea6
Change-Id: I202635b9b7c0800eadfe0923e29c94d2dd39dcb5
Mathieu Chartier [Wed, 1 Nov 2017 01:44:49 +0000 (01:44 +0000)]
Merge changes I2ef3737f,If080281f am:
bb3de35e5f am:
18a93665a0 -s ours
am:
ad8030f578 -s ours
Change-Id: If3dc1463089b22f16617077bf4de1303a1c523c0
Jeff Sharkey [Wed, 1 Nov 2017 01:35:21 +0000 (01:35 +0000)]
Merge "Change storage migration to use quota APIs." am:
0fccecc6a0 am:
83fabf2fd6 -s ours
am:
034d66ec5d -s ours
Change-Id: I08a0a73e8238a1a6caf876665aa01e7c3384a1b0
Steven Moreland [Wed, 1 Nov 2017 01:19:01 +0000 (01:19 +0000)]
Merge "Reland "HIDL Java getService now the same as C++."" am:
c1616f6820 am:
0c6f0240b2
am:
be0f18fe3d
Change-Id: If15ebb8582478ebcc8d45a2ace0c8f2825932dc9
TreeHugger Robot [Wed, 1 Nov 2017 00:43:38 +0000 (00:43 +0000)]
Merge "Correct stackstack typo"
Winson Chung [Wed, 1 Nov 2017 00:42:27 +0000 (00:42 +0000)]
Merge changes Icb5ea78e,I1cf97299
* changes:
Move more calls to the lib.
Migrating some animation spec logic to shared lib
Andreas Huber [Wed, 1 Nov 2017 00:03:34 +0000 (00:03 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob." am:
a546c38130
am:
33569ca480
Change-Id: Ic3048cf4539b112027089726b529e3c0838c40f4
Mathieu Chartier [Tue, 31 Oct 2017 23:57:53 +0000 (23:57 +0000)]
Merge changes I2ef3737f,If080281f am:
bb3de35e5f
am:
18a93665a0 -s ours
Change-Id: Ic8b4862eca342e5b9705c16879d800005a2291bf
TreeHugger Robot [Tue, 31 Oct 2017 23:52:11 +0000 (23:52 +0000)]
Merge "Fixing javadoc typo from gerrit
3027804"
Jeff Sharkey [Tue, 31 Oct 2017 23:48:13 +0000 (23:48 +0000)]
Merge "Change storage migration to use quota APIs." am:
0fccecc6a0
am:
83fabf2fd6 -s ours
Change-Id: I9023d8214f0f899d6065a074a92e80dea7359280
Steven Moreland [Tue, 31 Oct 2017 23:40:34 +0000 (23:40 +0000)]
Merge "Reland "HIDL Java getService now the same as C++."" am:
c1616f6820
am:
0c6f0240b2
Change-Id: I35ee525aaa1563cc6d8fde5dac1e38e04803bb38
TreeHugger Robot [Tue, 31 Oct 2017 23:12:51 +0000 (23:12 +0000)]
Merge "WebView: misc docs changes in WebViewClient"
Andreas Huber [Tue, 31 Oct 2017 23:08:26 +0000 (23:08 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob."
am:
a546c38130
Change-Id: I969ec51ed8fc6c7e11e7cfe7c4e1a3d6aa5802de
Treehugger Robot [Tue, 31 Oct 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob."
TreeHugger Robot [Tue, 31 Oct 2017 22:39:59 +0000 (22:39 +0000)]
Merge "Add READ_PHONE_STATE to MediaProvider."
Mathieu Chartier [Tue, 31 Oct 2017 22:31:32 +0000 (22:31 +0000)]
Merge changes I2ef3737f,If080281f
am:
bb3de35e5f
Change-Id: Ibe1af669d200057f1d91142299055694b55b5660
Jeff Sharkey [Tue, 31 Oct 2017 22:22:21 +0000 (22:22 +0000)]
Merge "Change storage migration to use quota APIs."
am:
0fccecc6a0
Change-Id: I15f1aa9f01b5cef928b8b68e2568bf67e1e387b9
Steven Moreland [Tue, 31 Oct 2017 22:16:18 +0000 (22:16 +0000)]
Merge "Reland "HIDL Java getService now the same as C++.""
am:
c1616f6820
Change-Id: I5d53c369ae9cb1bc963b06e734cf9c47ad61265f
TreeHugger Robot [Tue, 31 Oct 2017 21:59:53 +0000 (21:59 +0000)]
Merge "Set updated system package's mExtra"
Shubham Ajmera [Thu, 25 May 2017 00:46:36 +0000 (17:46 -0700)]
Reduce app size by downgrading inactive apps
This will trigger when the device will have low space.
Active apps here refer to the apps which were either active
in foregrond or in background and also used by other packages.
Apps which are inactive for X days downgraded to verify. X is
determined by sysprop pm.dexopt.unopt_after_inactive_days
If the system properties are not set, no effect will take place.
The above operations will take place in background dexopt service.
If user uses the app again, it will again be speed-compiled when
background dexopt service starts next time.
(cherry picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Bug:
36598475
Test: manual
* Remove the check in the code that allows downgrade only when
the space is low on the device.
* adb root
* Set pm.dexopt_unopt_after_inactive_days to 600
* Make sure the current time of the device is correctly set
* Install 2 non system apps - B, C
* Downgrade B to extract
* Upgrade a system apps to speed-profile - E
* Downgrade a system app to quicken - G
* adb shell cmd package bg-dexopt-job
Expected Results:
* Extract - B
* Verify - C
* There should not be any entries for apps E an G
in dalvik_cache
Merged-In: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Change-Id: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Treehugger Robot [Tue, 31 Oct 2017 21:48:30 +0000 (21:48 +0000)]
Merge changes I2ef3737f,If080281f
* changes:
Add property for system server compiler filter
Compile secondary dex at boot after OTA
Treehugger Robot [Tue, 31 Oct 2017 21:47:19 +0000 (21:47 +0000)]
Merge "Change storage migration to use quota APIs."
Leon Scroggins III [Tue, 31 Oct 2017 21:26:22 +0000 (21:26 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am:
c4049e247f am:
5fe26063fe am:
49767aa7f7
am:
62b836c156 -s ours
Change-Id: If76248e8bd13e5815556c850586383902d0ab819
Andreas Huber [Tue, 31 Oct 2017 18:51:50 +0000 (11:51 -0700)]
Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob.
Bug:
68654583
Test: hidl_test_java
Change-Id: I6ec799b423396f9212e4c221e41791adc9086410
Treehugger Robot [Tue, 31 Oct 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Reland "HIDL Java getService now the same as C++.""
TreeHugger Robot [Tue, 31 Oct 2017 21:13:53 +0000 (21:13 +0000)]
Merge "WebView: make notes in docs stand out"
Wyatt Riley [Tue, 31 Oct 2017 21:12:27 +0000 (14:12 -0700)]
Fixing javadoc typo from gerrit
3027804
Bug:
65369254
Test: Automated build/sanity only - just a comment change
Change-Id: I819b2f11f91454719269927ae93382253170938e
Leon Scroggins III [Tue, 31 Oct 2017 21:08:53 +0000 (21:08 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am:
c4049e247f am:
5fe26063fe
am:
49767aa7f7
Change-Id: Ic39deeaf1f9f8a50da5818302c4e4fa626a79665
TreeHugger Robot [Tue, 31 Oct 2017 21:07:55 +0000 (21:07 +0000)]
Merge "Fix testWindowProducerCopyToRGBA16F test on x86 emulator"
Nate Fischer [Tue, 31 Oct 2017 20:49:09 +0000 (13:49 -0700)]
WebView: misc docs changes in WebViewClient
No change to logic.
This CL has miscellaneous docs changes for WebViewClient.java:
* Spelling
* Codify some terms ({@code } annotations)
* Linkify references to other methods
Test: make docs (all links work, things look better)
Change-Id: Ia748a258a29b467b9655c018b5783b5b22fad0eb
Matthew Ng [Tue, 31 Oct 2017 21:01:31 +0000 (14:01 -0700)]
Correct stackstack typo
Changed function names that had stackstack to stack.
Test: go/wm_smoke
Bug:
68218244
Change-Id: I5792d657506fad615c2e4490796a85630ec74330
TreeHugger Robot [Tue, 31 Oct 2017 20:48:46 +0000 (20:48 +0000)]
Merge "WebView: document requirement for Activity Context"
Todd Kennedy [Tue, 31 Oct 2017 20:05:55 +0000 (13:05 -0700)]
Set updated system package's mExtra
While scanning system packages, we abort the process in the
middle of the scan and leave our internal structures in an
ill defined state. This change is not about making the structures
consistent; rather unblocking a build breakage. We'll look
at data consistency during a later refactoring stage when
the process of package scanning is fixed.
A reboot is necessary for the bug to exhibit itself because
the permissions are re-granted [or denied] on every boot.
Change-Id: I96cc2f76623911f2cf93727e9f1787b42210a8d6
Fixes:
68328870
Test: Manual.
Test: Add a new priv-app that take a privieleged permission.
Test: See that the permission is granted.
Test: Update the app and reboot
Test: See that the permission is still granted.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PermissionsHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermissionTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Test: bit FrameworksServicesTests:com.android.server.pm.PackageManagerSettingsTests
Leon Scroggins III [Tue, 31 Oct 2017 20:44:22 +0000 (20:44 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am:
c4049e247f
am:
5fe26063fe
Change-Id: Id5c198a7f1a893f9d8f39dfd2927c471a624c3ef
TreeHugger Robot [Tue, 31 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Make CarrierConfigManager#KEY_CDMA_ROAMING_MODE public."
Leon Scroggins III [Tue, 31 Oct 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
am:
c4049e247f
Change-Id: I7636d9eaf3983fc7ed0c1dc59ec2671ff762206e
TreeHugger Robot [Tue, 31 Oct 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Allow dnd access for secondary users"
TreeHugger Robot [Tue, 31 Oct 2017 20:16:27 +0000 (20:16 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
Charles He [Tue, 31 Oct 2017 20:08:56 +0000 (20:08 +0000)]
Merge "AM: make LockTask truly multi-task-aware."
Dianne Hackborn [Tue, 31 Oct 2017 19:55:42 +0000 (19:55 +0000)]
Merge "Fully implement "install" and "install-write" in PackageManagerShellCommand."
TreeHugger Robot [Tue, 31 Oct 2017 19:49:19 +0000 (19:49 +0000)]
Merge "AAPT2: Allow for nested inline xmls"
Android Build Merger (Role) [Tue, 31 Oct 2017 19:23:26 +0000 (19:23 +0000)]
Merge "Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c am:
d08f60ba71 am:
a3b1a48d4c"
Siyamed Sinir [Tue, 31 Oct 2017 19:21:57 +0000 (19:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c am:
d08f60ba71
am:
a3b1a48d4c
Change-Id: Id55dc21826e027094b3e5bdd445092f9474379bb
TreeHugger Robot [Tue, 31 Oct 2017 19:21:53 +0000 (19:21 +0000)]
Merge "Simple numbering system selector for LocalePicker."
Winson Chung [Tue, 31 Oct 2017 18:35:30 +0000 (11:35 -0700)]
Move more calls to the lib.
- Move the task stack listener wrapper into the shared lib, along with some
other AM calls.
Bug:
67510855
Test: Launch recents
Change-Id: Icb5ea78ec42d4b76a1c531ce336dd9a3f07a9629
Steven Moreland [Wed, 25 Oct 2017 04:50:46 +0000 (04:50 +0000)]
Reland "HIDL Java getService now the same as C++."
Add getService(retry) for Java for C++ feature parity.
Test: hidl_test_java, boot
Bug:
67981006
Change-Id: I4e6711f8c2d7ad0ef6994ce9c480118320e1bde8
Siyamed Sinir [Tue, 31 Oct 2017 18:52:25 +0000 (18:52 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c
am:
d08f60ba71
Change-Id: Ib7093da46b6aa094fc0b945802fc6f19bc39a2cf
Siyamed Sinir [Tue, 31 Oct 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4
am:
43c494cb9c
Change-Id: I398b3011295e2783f23ca7993cbca273fef38e47
Julia Reynolds [Tue, 24 Oct 2017 14:39:11 +0000 (10:39 -0400)]
Allow managed services on watches
Test: runtest systemui-notification
Change-Id: I5b2f7ae62f118c641f2d06ef8a70222a4a1ca37e
Fixes:
66954790
Chong Zhang [Tue, 31 Oct 2017 18:34:51 +0000 (18:34 +0000)]
Merge "heif: support heif image sequence and dual-function files"
Michael Plass [Tue, 31 Oct 2017 18:33:05 +0000 (18:33 +0000)]
Merge "Metrics wifi.proto for connected wifi score"
Mathieu Chartier [Fri, 16 Jun 2017 02:09:38 +0000 (19:09 -0700)]
Add property for system server compiler filter
The property is dalvik.vm.systemservercompilerfilter, this changes
if dexopt is needed.
(cherry picked from commit
5e07a0d9cacb1bf943f4617b1edcb930e1578dad)
Bug:
62356545
Test: adb shell setprop dalvik.vm.systemservercompilerfilter quicken
Test: adb shell stop && adb shell start
Merged-In: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Change-Id: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Roozbeh Pournader [Tue, 31 Oct 2017 18:28:32 +0000 (18:28 +0000)]
Merge "Parse BCP 47 locale names with Unicode extensions"
Stefan Lafon [Tue, 31 Oct 2017 04:20:20 +0000 (21:20 -0700)]
Generate constants for enum values.
Test: Builds successfully, tests pass and statsd works (it seems).
This will allow us to use those constants instead of literals.
The generated code only augmentes the java constant file.
If needed, the same can be done for the C++ file.
Some of the constant names are very long, but this is due to enum value names that are unnecessarily redundant with the enum names, i.e.
enum ENUM_NAME {
ENUM_NAME_UNKNOWN = 0;
ENUM_NAME_VALUE1 = 1;
ENUM_NAME_VALUE2 = 2;
...
}
which can be fixed by avoiding the 'ENUM_NAME_' part in the value names above.
So, when possible, we should use shorter value names in stats_events.proto.
Change-Id: I1ad19b86e28d0df0f8c15d4c995d101423cff4c2
Siyamed Sinir [Tue, 31 Oct 2017 18:21:55 +0000 (18:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375
am:
6ad6e7f2f4
Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c
Siyamed Sinir [Tue, 31 Oct 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991
am:
cc2fcef375
Change-Id: I6c7a98c8e38a38dcd9ea2aa423ee93dbd0f12ed4
Jeff Davidson [Wed, 25 Oct 2017 19:51:43 +0000 (12:51 -0700)]
Make CarrierConfigManager#KEY_CDMA_ROAMING_MODE public.
Mode constants have been moved to TelephonyManager.
Change-Id: I8c9091d9e71e1e38ff31e852301981f268b640cd
Fixes:
29163993
Test: TreeHugger only (no functional changes)
Michael Wachenschwanz [Tue, 31 Oct 2017 02:06:23 +0000 (19:06 -0700)]
AAPT2: Allow for nested inline xmls
Add recursion to InlineXmlFormatParser::Consume for handling nested
aapt:attr
Change-Id: Iabf98945b4f5ef22a3b8fdc4ca2bac092a377629
Fixes:
64385167
Test: make aapt2_tests
Siyamed Sinir [Tue, 31 Oct 2017 17:59:25 +0000 (17:59 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a
am:
9422f6e991
Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d
Dianne Hackborn [Mon, 30 Oct 2017 21:19:32 +0000 (14:19 -0700)]
Fully implement "install" and "install-write" in PackageManagerShellCommand.
We can use the new mechanism to ask the calling shell to open
a file in order to implement the rest of these commands, allowing
you to give the path to an apk to install. That API is thus
extended to allow you to open readable files, not just opening
file for writing.
Doing this however means we no longer can pass a file path to
AssetManager for the apk to parse, we only have an already open
fd for that. Extending AssetManager to allow adding apks from
fds is not that hard, however, since the underlying zip library
already supports this.
This main thing this changes is in AssetManager.cpp where we
retrieve the open zip file for a particular apk that has been
added. This used to look up the zip file by path every time
it was needed, but that won't work anymore now that we can have
things added by fd. Instead, we keep track of each opened zip
in the AssetManager, so we can just directly retrieve it from
the asset_path representing the item that was added. As a
side-effect, this means for normal paths we no longer need to
look up by name, but just have the opened zip file directly
accessible. (This is probably good, but it does mean that we
no longer run the logic of seeing if the zip file's timestamp
has changed and re-opening it if it has. We probably shouldn't
be relying on that for an active AssetManager anyway, and maybe
it is even good that we don't allow the zip file to change
under it?)
A follow-up change will finally remove the Pm.java implementation
and turn the pm "command" into a simple shell script that runs
cmd package.
Test: manual
Change-Id: Ie103e3bdaa5b706796cc329254f2638151a3924f
TreeHugger Robot [Tue, 31 Oct 2017 17:52:52 +0000 (17:52 +0000)]
Merge "Display network name in status bar"
Siyamed Sinir [Tue, 31 Oct 2017 17:41:58 +0000 (17:41 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e
am:
b353fbcb7a
Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
Yi Jin [Tue, 31 Oct 2017 17:33:13 +0000 (17:33 +0000)]
Merge "Create a new API allowing callers to concat a serialized message field."
Siyamed Sinir [Tue, 31 Oct 2017 17:18:57 +0000 (17:18 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf
am:
eb863a6b2e
Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c
Winson Chung [Sat, 28 Oct 2017 00:32:03 +0000 (17:32 -0700)]
Migrating some animation spec logic to shared lib
- Used for the current transition to/from Recents and for docking, move the
async app transition animation spec logic to the lib. It will be removed
later once we have app controled surface controls.
Bug:
67510855
Test: Launch recents/app, dock app from dragging
Change-Id: I1cf972991e5ef73906c3bcd8e5ff187ce2e62cd8
Android Build Merger (Role) [Tue, 31 Oct 2017 17:14:37 +0000 (17:14 +0000)]
Merge "Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572 am:
88f92e101d am:
5878e9c46b am:
1e52719791"
Siyamed Sinir [Tue, 31 Oct 2017 17:13:06 +0000 (17:13 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572 am:
88f92e101d am:
5878e9c46b
am:
1e52719791
Change-Id: I946cb4da20d299c529a90ee7557e7d128e2e9504
TreeHugger Robot [Tue, 31 Oct 2017 17:11:37 +0000 (17:11 +0000)]
Merge "Add metric constant for oem lock dialog"
Siyamed Sinir [Tue, 31 Oct 2017 17:05:15 +0000 (17:05 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856
am:
eeb90235bf
Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952
Shubham Ajmera [Fri, 9 Jun 2017 22:40:58 +0000 (15:40 -0700)]
Compile secondary dex at boot after OTA
(cherry picked from commit
ce54397368dc98182d7b4eb2ff3c142bbd87e39d)
Bug:
38413085
Test: build successful
Merged-In: If080281fb3147fea625bcafce91167e8c1439736
Change-Id: If080281fb3147fea625bcafce91167e8c1439736
TreeHugger Robot [Tue, 31 Oct 2017 17:02:59 +0000 (17:02 +0000)]
Merge "Fix failing/flaky TextViewActivityTests"
Siyamed Sinir [Tue, 31 Oct 2017 16:55:04 +0000 (16:55 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572 am:
88f92e101d
am:
5878e9c46b
Change-Id: Id2e10f670cf6687fe62dbe67bb7615b9121743f4
Siyamed Sinir [Tue, 31 Oct 2017 16:53:16 +0000 (16:53 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b
am:
bc56010856
Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
Jeff Sharkey [Thu, 6 Jul 2017 17:29:06 +0000 (11:29 -0600)]
Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
(cherry picked from commit
c8b29ac6f0340bd0c3c9eb388c4be2d446de9a59)
Bug:
36056324
Test: builds, boots
Merged-In: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Change-Id: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Siyamed Sinir [Tue, 31 Oct 2017 16:42:48 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572
am:
88f92e101d
Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815
Siyamed Sinir [Tue, 31 Oct 2017 16:42:29 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03
am:
1f8536653b
Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
Andrew Solovay [Tue, 31 Oct 2017 16:41:00 +0000 (16:41 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev am:
f8fb25ca04
am:
4450e53ee0
Change-Id: I90bd3cca6876e22d7bf4097040bdd5d21a8f68ef
Siyamed Sinir [Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a
am:
c275b77b03
Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
Andrew Solovay [Tue, 31 Oct 2017 16:31:12 +0000 (16:31 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
am:
f8fb25ca04
Change-Id: I450ba09a2f6efb155601cd08fe9e1d0c35e9fec5
Siyamed Sinir [Tue, 31 Oct 2017 16:31:04 +0000 (16:31 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
am:
31bcb22572
Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005
Siyamed Sinir [Tue, 31 Oct 2017 16:25:26 +0000 (16:25 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
am:
a0c253d07a
Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
Siyamed Sinir [Tue, 31 Oct 2017 16:17:06 +0000 (16:17 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
Siyamed Sinir [Tue, 31 Oct 2017 16:16:16 +0000 (16:16 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
Andrew Solovay [Tue, 31 Oct 2017 16:15:57 +0000 (16:15 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
Kensuke Matsui [Tue, 14 Mar 2017 04:27:20 +0000 (13:27 +0900)]
Display network name in status bar
When config_showOperatorNameInStatusBar is true, the network name is
displayed in the status bar.
The user can turn on/off the feature from Settings app (Settings >
Display > Network name).
Fixes:
67620513
Test: manual - insert a valid SIM and go to the Home screen.
Change-Id: I6d03ec00a19e2f5e4c2d2918f1a7c33fdee00dd2
Android Build Merger (Role) [Tue, 31 Oct 2017 15:55:26 +0000 (15:55 +0000)]
Merge "Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am:
834be81189 am:
8476a2c75d am:
c77b846688"
Colin Cross [Tue, 31 Oct 2017 15:53:21 +0000 (15:53 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am:
834be81189 am:
8476a2c75d
am:
c77b846688
Change-Id: Id27ebbdae64400b3e55915dda1cd9186ddd8f1f6
Winson Chung [Tue, 31 Oct 2017 15:50:29 +0000 (15:50 +0000)]
Merge "Cleaning up InputConsumers"
Stan Iliev [Tue, 31 Oct 2017 15:47:54 +0000 (11:47 -0400)]
Fix testWindowProducerCopyToRGBA16F test on x86 emulator
Fix readback to return correct error code on X86 emulator, when
half float pixel format is not supported.
Test: Ran and passed all CtsViewTestCases tests on x86 emulator
Bug:
68383159
Change-Id: Id66484b73488e2c8d29fbecbd45a97af285a0710
Colin Cross [Tue, 31 Oct 2017 15:42:52 +0000 (15:42 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am:
834be81189
am:
8476a2c75d
Change-Id: I005a2a4b02c2c0665e2f3aa84d59c5202a8991cb
Colin Cross [Tue, 31 Oct 2017 15:33:53 +0000 (15:33 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
am:
834be81189
Change-Id: Iec1547cc91bf3cb08a47194e91838eb77b4126d7
Treehugger Robot [Tue, 31 Oct 2017 15:24:11 +0000 (15:24 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
Abodunrinwa Toki [Tue, 31 Oct 2017 03:46:46 +0000 (03:46 +0000)]
Fix failing/flaky TextViewActivityTests
These tests are flaky because each negative assertion in Espresso
is taking about a minute or two to run. Espresso is waiting that long.
This cl solves the issue by:
1. Deprecating and excluding the negative assertions where they are
not required for the test to still be meaningful.
2. Re-written to no use negative assertions where possible.
3. Suppress a failing test. We're not getting much value from this
anyway.
TODO (in incoming cl): Alternative action mode assertions.
Change-Id: Ic808f687151d225689d839b4caf4ef0b8d70cff0
Bug:
67023680
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Tobias Thierer [Tue, 31 Oct 2017 14:01:37 +0000 (14:01 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am:
b519569eb3 am:
4f59edb63f
am:
60923f7860
Change-Id: I52d63eac03e32f6d020809cae2cecb7cad0154c0