Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
361,349 Commits 3 Branches 0 Tags
32ef1c2eb0fe32d8fd02a44bc77b40ab7719c433
Commit Graph

88343 Commits

Author SHA1 Message Date
Jeff Vander Stoep
32ef1c2eb0 Revert "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" 
Commit 042f4bb6 'pm: Modify getPackage() to only return non-null
packages' prevents the NullPointerException. b/
This reverts commit 00b4fa8b13.

Bug: 74214574
Bug: 72290969
Test: Same tests run on original commit.
Test: successfully flash and boot from bild 4504078 to ToT master.
Change-Id: Ia1e900ebe0eb8f9d10fd0eddbf658f52e1ea79b4
 2018-03-06 16:51:26 -08:00
Android Build Merger (Role)
a2b1bb961e Merge "Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a am: a6905db1d8 am: d2832e320b" 2018-03-06 20:48:50 +00:00
Remi NGUYEN VAN
87fbc0c9b8 Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a am: a6905db1d8 
am: d2832e320b

Change-Id: Ia84d2c7cc63bf8b8bf30f133e0382fd7103bf490
 2018-03-06 20:48:32 +00:00
TreeHugger Robot
f4fcad476b Merge "Add APP_AUTO_RESTRICTION_ENABLED" 2018-03-06 20:48:28 +00:00
Andrew Grieve
1a8248a3b1 Merge "Merge "Expose Process.isIsolated()" into pi-dev am: 6ddf443d15" into pi-dev-plus-aosp 
am: 8b2817d0e1

Change-Id: I496fef1dad9c8c62f0d0ccbeab5d5a05ef092cee
 2018-03-06 20:26:43 +00:00
Remi NGUYEN VAN
d2832e320b Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a 
am: a6905db1d8

Change-Id: I1e4e283c6eaecf33d12488e41e0c524f6ff83954
 2018-03-06 19:52:57 +00:00
Andrew Grieve
e7bb5673fe Merge "Expose Process.isIsolated()" into pi-dev 
am: 6ddf443d15

Change-Id: I02cb0a0bb503201ea4b4e9ca4961e5687a51e6d8
 2018-03-06 19:45:12 +00:00
Remi NGUYEN VAN
a6905db1d8 Merge "Allow null subscriberId in NetworkStatsManager." 
am: 6bd13af46a

Change-Id: I900ac14224284fc3a1422e8791bc54d6a9ee77ba
 2018-03-06 19:37:13 +00:00
TreeHugger Robot
6ddf443d15 Merge "Expose Process.isIsolated()" into pi-dev 2018-03-06 19:20:47 +00:00
TreeHugger Robot
ac89b0e903 Merge "Throw an exception in case of parameter mismatch of precomputed text" 2018-03-06 19:13:20 +00:00
Lucas Dupin
d4424e791d Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev am: 1c6e3ba66d 
am: 106df024b6

Change-Id: Ib89ed33334322cc67a267a9d27212fd6a8684da4
 2018-03-06 18:32:37 +00:00
Lucas Dupin
106df024b6 Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev 
am: 1c6e3ba66d

Change-Id: I75f1594b938679919d531ff9b27b43e0a59a433d
 2018-03-06 17:56:39 +00:00
Richard Ledley
4f8464de33 Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." 2018-03-06 17:36:55 +00:00
Lucas Dupin
1c6e3ba66d Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev 2018-03-06 17:34:48 +00:00
Andrew Grieve
0fec93682e Expose Process.isIsolated() 
Rather than have a process attempt to perform IO / IPC and check if it
fails, it makes much more sense to expose this getter.

My specific motivation for exposing this information more directly is to
be able to perform process-specific initialization logic in
Application.attachBaseContext():

https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java?rcl=ac2e180a1265f88dd4030bb35d69f5d0b2dc488d&l=54

Bug: 73343822
Test: Same code that's used in Chrome via reflection.
Change-Id: I1505962679da36ac42401230b204bff7b3376b73
 2018-03-06 17:17:43 +00:00
Tony Mak
409e11d575 Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev am: bf8137a7cd 
am: 6a6e20a432

Change-Id: I56677f1eac63fa2c9f97870808c2afd47c6da9a2
 2018-03-06 16:14:12 +00:00
Tony Mak
6a6e20a432 Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev 
am: bf8137a7cd

Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32
 2018-03-06 15:46:32 +00:00
TreeHugger Robot
bf8137a7cd Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev 2018-03-06 15:23:18 +00:00
TreeHugger Robot
e4936647e9 Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" 2018-03-06 14:43:35 +00:00
Mathew Inwood
a9c56d53e6 Merge "Don't whitelist all system image apps." into pi-dev 
am: 3fbc54e609

Change-Id: I6eef88e7080c8c599494448b640ba0284cb30f6d
 2018-03-06 12:07:30 +00:00
TreeHugger Robot
3fbc54e609 Merge "Don't whitelist all system image apps." into pi-dev 2018-03-06 11:50:23 +00:00
Tony Mak
6a97535f28 Revert accidental change of isUsingUnifiedPassword javadoc 
Test: None

Change-Id: I72735b790ae37838917b2330b84a3cfef32ce7b8
 2018-03-06 11:34:08 +00:00
Pete Gillin
6d4886766c Merge "Add new 'explicit GC' policy to StrictMode." 2018-03-06 11:08:56 +00:00
Mike Ma
6f1746aa43 Merge "Power profile audio & video support" into pi-dev am: 1ab03020db 
am: eece6eb9df

Change-Id: I53ea0a6f2453f56f18848638d07ef5194973824c
 2018-03-06 10:24:41 +00:00
Mathew Inwood
6827f4a2c8 Don't whitelist all system image apps. 
Also include in system dump which packages are exempt from the api
restrictions.

This is a cherry-pick of 974290b032
from master.

Test: Verified that the device boots.
Bug: 64382372
Change-Id: Iaeca91478f53c8b4e9608246aab42bdb90f899bb
 2018-03-06 09:54:55 +00:00
Insun Kang
f3e9ee6587 Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev 
am: 27ed96bf0c

Change-Id: I754bda631577db7179f0d7811b75a26a8a9c392a
 2018-03-06 08:59:05 +00:00
Mike Ma
eece6eb9df Merge "Power profile audio & video support" into pi-dev 
am: 1ab03020db

Change-Id: I073bc1f1ab6ff7be692df042b94e05cba42eea2d
 2018-03-06 08:33:57 +00:00
Jeffrey Vander Stoep
00b4fa8b13 Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion" 
This reverts commit 8196fd9380.

Reason for revert: b/74214574

Bug: 74214574
Change-Id: I9602872238ccc8a49d8b200e5389995d597f1c3a
 2018-03-06 08:22:20 +00:00
TreeHugger Robot
27ed96bf0c Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev 2018-03-06 07:55:14 +00:00
TreeHugger Robot
1ab03020db Merge "Power profile audio & video support" into pi-dev 2018-03-06 07:44:28 +00:00
Fyodor Kupolov
8db0bf356a Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev am: d97a0f1ac5 
am: d4315862cc

Change-Id: Ia73f006301d8225f7906612faa381f4307a23b51
 2018-03-06 07:18:09 +00:00
Jack He
41a2a79ff9 Merge "Merge "Bluetooth: Use enums for adapter connection states" am: 95372e873e am: 8da4504cad" into pi-dev-plus-aosp 
am: 3bc933c57f

Change-Id: I87ca2c0e8f11e17e0ac3aa14d3eb77415b5b9473
 2018-03-06 07:08:37 +00:00
Erik Kline
a69df717ce Merge "Fail if the interface is not available when starting" into pi-dev 2018-03-06 05:53:29 +00:00
Insun Kang
7c5b02dff8 VideoView2: Move MediaContolView2's hidden constant 
Bug: 74173212
Test: VideoViewTest app
Change-Id: Ic91e0b0bfb910d555c1dbe77f028a017f2a18b79
(cherry picked from commit a0fdcc97f0)
 2018-03-06 05:51:56 +00:00
Remi NGUYEN VAN
489e8b02f8 Allow null subscriberId in NetworkStatsManager. 
Use a MATCH_MOBILE_WILDCARD template to avoid filtering by
subscriberId when querying statistics from NetworkStatsService.

Bug: 74038898
Change-Id: I4b39e7031416cb33b23d89aa36ff0f774eaa942f
Fixes: 74038898
Test: runtest frameworks-net, CTS tests pass
 2018-03-06 13:28:19 +09:00
Ben Lin
406605ff3f Merge "Add new Intent start a package's Open By Default page directly." 2018-03-06 04:01:39 +00:00
TreeHugger Robot
faf6589748 Merge "Bluetooth: Use enums for adapter connection states" into pi-dev 2018-03-06 03:33:42 +00:00
TreeHugger Robot
00cbd158f8 Merge "Refactor cpu stats pullers" 2018-03-06 03:26:26 +00:00
Erik Kline
ea1b8bd5a5 Fail if the interface is not available when starting 
Addresses a long-standing TODO.  Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).

Also:
    - add a test
    - refactor for testability
    - delete some constructors no longer used
    - properly handle passed-in null IpClient.Callback
    - some more IpManager -> IpClient renaming
    - permit recording metrics before starting a provisioning
      attempt (logging immediate errors) without Log.wtf().

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
    - runtest frameworks-net passes
    - basic WiFi IpClient connections works fine
Bug: 62476366
Bug: 73487570
Merged-In: I68e5e24122dc31e730cdbe8d75e33847e6332da4
Merged-In: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Merged-In: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
(cherry picked from commit b152cd0aa4)
 2018-03-06 11:06:34 +09:00
Mike Ma
07305c0b46 Power profile audio & video support 
Add power consumed by audio and video hardware to power profile.
Attribute these power to specific app.
Bug: 70531798
Test: PowerProfileTest
Test: BatteryStatsHelperTest
Test: PowerCalculatorTest
Change-Id: I4811efa14ce97983258cd59bfd328181fe95baf4
 2018-03-05 18:06:29 -08:00
Jack He
bd020a6f5a Bluetooth: Use enums for adapter connection states 
Bug: 69478930
Test: make, no user visible change
Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1
(cherry picked from commit ee81f99150)
 2018-03-05 17:27:05 -08:00
Fyodor Kupolov
d4315862cc Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev 
am: d97a0f1ac5

Change-Id: Ide1400a320ec6f3d5428fdfffae613d15319afe3
 2018-03-06 01:25:42 +00:00
Jack He
775c458d40 Merge "Bluetooth: Use enums for adapter connection states" am: 95372e873e 
am: 8da4504cad

Change-Id: I7e0ed2b7a0b67bb443b9e104a7985e3a9bed96ff
 2018-03-06 01:17:15 +00:00
Tony Mak
b3ef16b002 Merge "Improve javadocs of some DPM APIs" into pi-dev 
am: 889cf2e00d

Change-Id: I39e374287a4c37dfd644e5b4292f0801070ce6ad
 2018-03-06 01:03:14 +00:00
Jack He
8da4504cad Merge "Bluetooth: Use enums for adapter connection states" 
am: 95372e873e

Change-Id: Iab73a463f99de6113146b6541babe95b512ebbfa
 2018-03-06 01:02:52 +00:00
Fyodor Kupolov
d97a0f1ac5 Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev 2018-03-06 00:28:51 +00:00
Chenjie Yu
f248047d74 Refactor cpu stats pullers 
use same cpu stats readers with BatteryStats so that
1) both throttle to avoid too frequent pulls
2) cached value is served within throttle interval to avoid double
pulling by both statsd and BatteryStats

To run unit tests:
bit FrameworksCoreTests:com.android.internal.os.KernelUidCpuFreqTimeReaderTest
bit FrameworksCoreTests:com.android.internal.os.KernelUidCpuClusterTimeReaderTest
bit FrameworksCoreTests:com.android.internal.os.KernelUidCpuActiveTimeReaderTest

make -j56 statsd_test && adb sync data && adb shell /data/nativetest64/statsd_test/statsd_test

Test: cts test, unit test
Fix: 73745189
Fix: 73780619
Fix: 73360959

Change-Id: I10a9bc91ca67fa812f4cd71c4fbd73c1a5ba580e
 2018-03-05 15:47:39 -08:00
Treehugger Robot
95372e873e Merge "Bluetooth: Use enums for adapter connection states" 2018-03-05 23:16:21 +00:00
Treehugger Robot
84bda3a709 Merge "DO NOT MERGE Dummy StatsLog class" 2018-03-05 23:14:48 +00:00
Amith Yamasani
14c716c911 Revert "Allow restoring of apps that rotated key" 
This reverts commit 313d225cd1.

Reason for revert: b/74159113

Change-Id: I483ecdd80d26fca8451cd270b4fcbe34379839cb
 2018-03-05 20:40:23 +00:00