Commit Graph

86426 Commits

Author SHA1 Message Date
TreeHugger Robot
03e7ec201b Merge "Add SystemApi in SystemProperties for vendor apks" 2018-01-23 04:14:01 +00:00
Calin Juravle
cd99c3a17a Merge "Perform a non strict matching of .dm files when computing the size" 2018-01-23 04:11:04 +00:00
Lorenzo Colitti
2899a0ed1b Merge "Support passing a template to NetworkStatsManager queries." 2018-01-23 04:02:58 +00:00
TreeHugger Robot
eb6ae9e43e Merge "Remove all the implementation for keep eSIM profile during FDR" 2018-01-23 03:41:43 +00:00
TreeHugger Robot
3bc6f794e6 Merge "camera: Modify AF scene change" 2018-01-23 03:03:31 +00:00
Android Build Merger (Role)
6463159684 Merge "Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac am: 0e32a62cd4 am: 75774be569" 2018-01-23 02:53:05 +00:00
Yin-Chia Yeh
2d3cae80d9 Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac am: 0e32a62cd4
am: 75774be569

Change-Id: I71a313e35f20c51403227523060914495e67c3bc
2018-01-23 02:52:15 +00:00
TreeHugger Robot
298f5dce77 Merge "Cellular/Wifi power profile" 2018-01-23 02:47:40 +00:00
Yin-Chia Yeh
75774be569 Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac
am: 0e32a62cd4

Change-Id: I5b2d1d756daf1fabd8d42b9161de6a63d8989302
2018-01-23 02:35:28 +00:00
Lorenzo Colitti
683f590c37 Merge "Remove obsolete NetworkStats.Entry constructor." am: 1683b6968d am: cdeb50aa48
am: cbbed8ee1f

Change-Id: Id6a664fd5ad8c182468b742e810e65afee248ad5
2018-01-23 02:35:08 +00:00
Lorenzo Colitti
cbbed8ee1f Merge "Remove obsolete NetworkStats.Entry constructor." am: 1683b6968d
am: cdeb50aa48

Change-Id: If60b58f95707bab3ae89050234226d54386398e8
2018-01-23 02:23:32 +00:00
Yin-Chia Yeh
0e32a62cd4 Merge "Camera: remove NOT_PRESENT cameras"
am: 174df238ac

Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
2018-01-23 02:12:57 +00:00
Lorenzo Colitti
cdeb50aa48 Merge "Remove obsolete NetworkStats.Entry constructor."
am: 1683b6968d

Change-Id: I72fe99d5e662a6a154f7b2d970c5926ee696e541
2018-01-23 02:08:18 +00:00
Sundong Ahn
5e05a9ae1c Add SystemApi in SystemProperties for vendor apks
The Apis in SystemProperties are needed for building ims.apk with
LOCAL_SDK_VERSION := system_current. So @SystemApi is added to
SystemProperties class and methods which are used by vendor apks (i.e.
ims.apk)

Bug: 67726847
Test: 1. build & boot on taimen
2. LOCAL_SDK_VERSION:=system_current in ims.apk && build ims.apk &&
check error count and android_system_stubs_current_intermediates.

Change-Id: I178f8d9b0b1f6bb1455ceec919805c4cc549cb32
2018-01-23 10:02:58 +09:00
Treehugger Robot
174df238ac Merge "Camera: remove NOT_PRESENT cameras" 2018-01-23 00:52:00 +00:00
Shuzhen Wang
98da482eca Merge "camera: Add support for multiple camera capture requests" 2018-01-23 00:36:16 +00:00
Lorenzo Colitti
9c93808e5e Merge changes I4d985a27,Ic6f2bc18
* changes:
  Add metered, roaming, and defaultNetwork info to NetworkTemplate.
  Unbreak frameworks-net tests broken by missing libutilscallstack.
2018-01-23 00:28:39 +00:00
Lorenzo Colitti
1683b6968d Merge "Remove obsolete NetworkStats.Entry constructor." 2018-01-23 00:15:15 +00:00
Christine Franks
bae5e6bda1 Merge "Change selection strategy for ACTION_DISMISS_TIMER" 2018-01-22 23:23:25 +00:00
TreeHugger Robot
58d241ce54 Merge "camera: Add OIS data keys" 2018-01-22 23:22:30 +00:00
TreeHugger Robot
de6d13f857 Merge "Changed onGetScores() to return null instead of throwing exception." 2018-01-22 22:46:22 +00:00
Calin Juravle
10b27eb2cc Perform a non strict matching of .dm files when computing the size
'adb shell pm install' creates the PackageLite structure without
validating or renaming the input files to '.apk'.

Be more permissive in DexMetadataHeler when computing the size of the
package to allow for this scenario.

Test: atest
core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java
Bug: 72267410

Change-Id: Ica446b0822be71826d02d01ada015a43d8133c68
2018-01-22 14:14:39 -08:00
TreeHugger Robot
83178bc099 Merge "Allow Recents in current user to access APIs in its child profile" 2018-01-22 22:09:19 +00:00
TreeHugger Robot
fb39fd90f0 Merge "Add the assisted dialing carrier config." 2018-01-22 21:56:25 +00:00
Ricky Wai
b7f09acde2 Merge "Use encoder id as insecure DP encoder random seed" 2018-01-22 21:47:38 +00:00
Siddharth Ray
2038af88f3 Cellular/Wifi power profile
- Added Cellular Energy Calculation
- Moved Wifi power profile to power_profile.xml

BUG:67213967

Test: Manual
Change-Id: I4b23b59fc6fa2461adc8ef6910d46b9f7ab02c83
2018-01-22 13:46:34 -08:00
Joachim Sauer
6e97afc157 Merge "Turn on new time zone picker flag by default." 2018-01-22 21:34:59 +00:00
Siddharth Ray
79a90c8317 Merge "Wifi: Add scanning, activity time and API" 2018-01-22 21:11:59 +00:00
TreeHugger Robot
5d86f5e30f Merge "Add PH flag for P power model" 2018-01-22 20:34:44 +00:00
Shuzhen Wang
e322374217 Merge "camera2: Add support for logical camera" 2018-01-22 20:30:15 +00:00
TreeHugger Robot
a036d599d2 Merge "Updating JavaDocs for more spans." 2018-01-22 20:28:25 +00:00
Qingxi Li
f4577a5c5c Remove all the implementation for keep eSIM profile during FDR
When we show the option to users to allow them decide whether they want
to keep eSIM profiles during FDR, we remove erasing eSIM profiles from
CompleteBootService. So there is no need to call
EuiccManager#retainSubscriptionsForFactoryReset again. And when we don't
show this option to users, we will always erase eSIM profiles with
isWipeEuicc equals to true.

Bug: 67500470
Test: E2E
Change-Id: Ide4ee5fbfd4b2aadc78071f8ecb8e0424a37db44
2018-01-22 12:25:34 -08:00
Lei Yu
d95e1d6edd Merge "Update comment for BATTERY_TIP_CONSTANTS" 2018-01-22 20:21:51 +00:00
Felipe Leme
029f10100c Changed onGetScores() to return null instead of throwing exception.
Callers (Session and AFMShellCommand) already handle null (in fact, the
signature declares it as @Nullable), so there's no point on throwing a
runtime exception...

Bug: 70939974
Test: 'adb shell cmd autofill get fc_score half kale' when service APK was not
      implementing it.

Change-Id: I37da6cd13c40545626332c272759e797b5a25924
2018-01-22 12:16:55 -08:00
Android Build Merger (Role)
0d7e3c63b5 Merge "Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0 am: 878abd8e91 am: 03eb67c287" 2018-01-22 20:16:34 +00:00
Andreas Gampe
627da5b264 Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0 am: 878abd8e91
am: 03eb67c287

Change-Id: Ib3b8b14907253b3438588fda8b5059f61b5594cf
2018-01-22 20:14:49 +00:00
TreeHugger Robot
c6f994207d Merge "Add pending system update info system APIs." 2018-01-22 20:12:43 +00:00
Jorim Jaggi
388090fbdd Check for surface validity to avoid native crash
If the surface gets destroyed, return -1 to indicate such that
the client can abort the animation, instead of crashing.

Test: With Launcher in multi-window
Change-Id: I4ab11557c40ed843a4c2e985a53cc2247b18b5fd
2018-01-22 20:08:41 +00:00
Benedict Wong
77dad60634 Merge "Rename create/delete transform methods" am: 7ee26e72cf am: 5b71c4a0a5
am: 5b3e788908

Change-Id: Ie07b0b608b3dfcbfc4228a15e26fe6f6559315f9
2018-01-22 20:03:48 +00:00
Andreas Gampe
03eb67c287 Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0
am: 878abd8e91

Change-Id: I862a822ef7600030f7b435fe9b9368961cf4694b
2018-01-22 20:01:18 +00:00
TreeHugger Robot
db0e05e576 Merge "Don't use user-tagged Uris in slice callbacks" 2018-01-22 20:00:30 +00:00
Yin-Chia Yeh
0c9f1e5ff5 Merge "Camera: codegen spec update" 2018-01-22 19:55:20 +00:00
Benedict Wong
5b3e788908 Merge "Rename create/delete transform methods" am: 7ee26e72cf
am: 5b71c4a0a5

Change-Id: I16bfb511ac2d6094e246f79d51fe4520d3e765cd
2018-01-22 19:53:15 +00:00
Andreas Gampe
878abd8e91 Merge "Debug: Add attachJvmtiAgent with classloader"
am: 940c0341f0

Change-Id: I0c9179b373040e7d4f54a5ad9835d14624012999
2018-01-22 19:48:28 +00:00
Benedict Wong
5b71c4a0a5 Merge "Rename create/delete transform methods"
am: 7ee26e72cf

Change-Id: I76576d1f3193fcbb3680fb29893cf696ea7a41fe
2018-01-22 19:44:43 +00:00
Eric Erfanian
af7b8c0a67 Add the assisted dialing carrier config.
This is used to activate the feature and show the settings.

Remove @hide from the public APIS.

Design doc:
go/assisted-dialing-dd-v1

Test: manual
Bug: 63934304
Change-Id: I09ea52720bf2439537e2f4ad32afb14f5df25f71
2018-01-22 19:23:04 +00:00
Vladislav Kuzkokov
ea4e107ada Merge "Unhide printing policy API." 2018-01-22 19:16:48 +00:00
Ricky Wai
875374a494 Use encoder id as insecure DP encoder random seed
Originally all apps that use insecure DP encoder will generate
the same result in IRR encoder as IRR is purely rely on random generator,
hence all apps will return the same IRR result in encodeBoolean() for
insecure encoder.

Now we change insecure encoder to use encoder id as random generator seed,
so different app will have different deterministic insecure encoder result.

Also, this CL fixes some existing failed tests.

Bug: 63908748
Test: runtest frameworks-services -p com.android.server.net.watchlist PASS
Test: bit FrameworksPrivacyLibraryTests:android.privacy.RapporEncoderTest PASS
Test: bit FrameworksPrivacyLibraryTests:android.privacy.LongitudinalReportingEncoderTest PASS
Change-Id: Iab84a2932d8f84da1dd2f880d2c1567dcbf1e090
2018-01-22 18:55:01 +00:00
Siddharth Ray
b50a684ba8 Wifi: Add scanning, activity time and API
Addition of Wifi Scanning time to Aggregate BatteryStats

Addition of Wifi Active time to BatteryStats (aggregate)

Addition of API to obtain Wifi battery stats for power drain diagnostics.

BUG:67213886

Test: Manual
Change-Id: I4f4c27ba839017d44feca685a4fae2f130d31765
2018-01-22 10:45:55 -08:00
Florina Muntenescu
6d0474944a Updating JavaDocs for more spans.
Test: N/A
Bug:72092996
Change-Id: I2706465d3d61117b0b5b9e6a013f213988c92521
2018-01-22 18:40:50 +00:00