Commit Graph

309172 Commits

Author SHA1 Message Date
Jason Monk
de850bbcaa Fix leaks in sysui
Add support for testing for PluginManager and TunerService leaks
and add tests for the known leaks and fix them. Also port PluginManager
and TunerService to Dependency to make them easier to handle in
tests.

Test: runtest systemui
Change-Id: I5642539ee24dd72f802905106decd0c87b41b4eb
Fixes: 34846972
2017-02-02 10:58:18 -05:00
Manu Cornet
c01308a03c Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev 2017-02-02 15:51:56 +00:00
Wale Ogunwale
a0cd15e1a0 Addition separation of adding vs. reparenting activity
- Removed method ActivityRecord.setTask which did only half of what
is needed when adding a task and also only did half of what is needed
for reparenting. Previous callers now need to call either
ActivityRecord.reparent() to reparent and activity or
TaskRecord.addActivityAtIndex() to add an activity to a task.
- Fixed some NPE that resulted from the above change.

Test: adb shell am instrument -w -e class
com.google.android.setupwizard.tests.activity.SetupWizardExitActivityTest
com.google.android.setupwizard.tests.activity
Bug: 34179495

Change-Id: Ic69487f51d1bd139825e6a8054a49ce143065a57
2017-02-02 06:48:56 -08:00
Gustav Sennton
f9295bcc24 Merge "Make sure we cannot use packages targeting pre-O as WebView packages." 2017-02-02 14:34:04 +00:00
Esteban Talavera
3355950785 Merge "Affiliated profile owners can set lock task packages" 2017-02-02 14:15:55 +00:00
Diego Perez
650d78042e Merge "Add ability to promote classes to public visibility" 2017-02-02 14:03:11 +00:00
Narayan Kamath
ff5659fbc3 Revert "Call ActivityCallbacks after corresponding activity methods"
This reverts commit 660cf30e21.

bug: 34415265
bug: 34914977
Test: chrome launches

Change-Id: I170365fd47313bafb0d722e6d55ee119336137c4
2017-02-02 13:55:31 +00:00
Pavel Grafov
739cda8f31 Fix the documentation for SecurityLog.SecurityEvent.getData().
If the payload contains more than one object, it is passed in Object[].

Change-Id: I28ca2ec35d920c644bdea13f15b2787ef3170310
Fixes: 34871284
Test: Read aloud, sounds good.
2017-02-02 12:47:53 +00:00
Chris Wren
27a52fa86b port status bar logs to Tron V2
Bug: 33303260
Test: runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/logging/legacy/ && runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone
Change-Id: I7746b846247e930617f0b440217635e71ed58bb5
2017-02-02 07:47:16 -05:00
Diego Perez
b74f748579 Add ability to promote classes to public visibility
Test: Added new PromoteClassClassAdapterTest
Change-Id: I30f9ee259d39e2b2768c1ceb45aa2161983c5a5e
(cherry picked from commit 294f0850f7623737899c9ea0b03cebc2cf7e4176)
2017-02-02 10:34:38 +00:00
Yohei Yukawa
ddad4b93fa Simplify the constructor of InputMethodInfo
This is a preparation CL for fixing Bug 32343335, where we aim to
avoid unnecessary reconstruction of InputMethodInfo objects by caching
immutable part of those metadata by APK revisions.

The reason why we have had to pass additional subtypes not just as
List<InputMethodSubtype> but as Map<String, List<InputMethodSubtype>>
to create an instance of InputMethodInfo is that how to compute
so-called IME ID is not exposed from InputMethodInfo even as @hide
method.

In practice it has been calculated as
  new ComponentName(packageName, serviceName).flattenToShortString()
and those IDs are already stored here and there including secure
settings.  It is almost impossible to change the rule anymore hence
we should consider them to be a kind of public API.

This CL adds a @hide static method InputMethodInfo#computeId() to
make it clear.  This also enables us to simplify the constructor
of InputMethodInfo finally, because we have used IME IDs as keys
in subtypes.xml, where additional subtypes are stored.

Test: Manually verified that addtional subtypes still work
Test: checkbuild
Bug: 32343335
Change-Id: I1deaa470e042eac749e7a847933d14448a0d9e03
2017-02-02 01:46:13 -08:00
Hyunyoung Song
3084ec2df4 Handle nullable drawables inside MaskableIconDrawable
Test: manual test
b/34902453

Change-Id: I36fc48f7e4c1f6503a9c26b8f239c62da729b490
2017-02-02 00:59:13 -08:00
Ying Wai (Daniel) Fan
419fbce429 Merge "Prevent division-by-zero error when calculating battery capacity." 2017-02-02 08:32:13 +00:00
Hugo Benichi
c23ff1d477 Merge "Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"" into nyc-mr2-dev-plus-aosp 2017-02-02 07:33:37 +00:00
Hugo Benichi
6776f79012 Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"
This reverts commit 814a59ba82 because it broke the build by duplicating code that was already there.

Change-Id: I1e32fd9e70629e5725e503ca372fb20c0aa0035d
2017-02-02 07:32:16 +00:00
Erik Kline
c700509ade Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259
am: 7196e935a8

Change-Id: I2ab05143299f13012dc2a88efca52160e08c6d97
2017-02-02 07:32:09 +00:00
Sergei Vasilinetc
f2ca8e030c Merge "Hardware bitmaps: Destroy texture ID generated for the copy" 2017-02-02 07:27:14 +00:00
Erik Kline
7196e935a8 Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe
am: 6f32aa0259

Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
2017-02-02 07:27:13 +00:00
Erik Kline
6f32aa0259 Merge "Add ConnectivityManager.networkCapabilitiesForType()"
am: c313123afe

Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
2017-02-02 07:22:05 +00:00
Treehugger Robot
c313123afe Merge "Add ConnectivityManager.networkCapabilitiesForType()" 2017-02-02 07:15:05 +00:00
Jeff Sharkey
2dfdf662d0 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:13:08 +00:00
Jeff Sharkey
6f13f73b73 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:12:41 +00:00
Jeff Sharkey
bac46f5b65 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:12:20 +00:00
Jeff Sharkey
b18bd06e94 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:11:55 +00:00
Jeff Sharkey
021747a076 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:11:23 +00:00
Jeff Sharkey
3e2652a55d DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:10:58 +00:00
Jeff Sharkey
b61338ecb3 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:10:20 +00:00
Hugo Benichi
814a59ba82 Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e
am: 7b39349792

Change-Id: I3d475b36e505e402d18a3942f557e2823d21416f
2017-02-02 06:52:37 +00:00
Hugo Benichi
7b39349792 Merge "Define Network notification proto constants." am: 05550d9ed8
am: 6236f49f0e

Change-Id: Ibb7620ea6946c2649d053859a2a1b55fbb78ed12
2017-02-02 06:47:35 +00:00
TreeHugger Robot
82c8e5c960 Merge "No warning/info log for expected/normal situations" 2017-02-02 06:46:33 +00:00
TreeHugger Robot
8585249248 Merge "Avoid NPE in NightDisplayService when VR mode is invoked" 2017-02-02 06:43:03 +00:00
Hugo Benichi
6236f49f0e Merge "Define Network notification proto constants."
am: 05550d9ed8

Change-Id: I3a169ace694ed42c59f3d818f007b638fdf4969f
2017-02-02 06:42:32 +00:00
Hugo Benichi
05550d9ed8 Merge "Define Network notification proto constants." 2017-02-02 06:36:22 +00:00
Andreas Gampe
0db10fd0bb Framework: Preloaded-classes tuning
Run the regular use case study.

Bug: 34890992
Test: m
Test: Device boots
Change-Id: I8387b3b09713bd3a031073c14109393a2583c764
2017-02-01 22:19:52 -08:00
Erik Kline
2ebea21074 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8
am: d85f448274

Change-Id: Ia629aa5dbdf10566c28525d9a05b096482db3f2d
2017-02-02 05:25:05 +00:00
Erik Kline
d85f448274 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5
am: 180a3d07a8

Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a
2017-02-02 05:20:05 +00:00
Erik Kline
180a3d07a8 Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
am: 603eefd5d5

Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
2017-02-02 05:15:23 +00:00
Tomasz Mikolajewski
813ef268ac Merge "Add plain mode for the quick viewer." 2017-02-02 05:10:31 +00:00
Treehugger Robot
603eefd5d5 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" 2017-02-02 05:07:23 +00:00
TreeHugger Robot
0a6d2b6dac Merge "Fix AutoFill Save window layout params." 2017-02-02 03:58:47 +00:00
Tomasz Mikolajewski
867addf393 Add plain mode for the quick viewer.
When EXTRA_QUICK_VIEW_PLAIN is passed, then plain UI should be shown.
This is just a hint for third party apps, whic may ignore it.

Test: Not testable, as it's just a hint.
Bug: 32161075
Change-Id: Ie244d28d552f6c654be93a5749ac164d2a77d25f
2017-02-02 12:21:16 +09:00
Suprabh Shukla
b99369c8a4 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca am: ac8f44e387 am: 3ee26841fd
am: a843ab955c  -s ours

Change-Id: I5de7b85e7cf6aae708512ec068edee82ad5ee239
2017-02-02 03:07:56 +00:00
Suprabh Shukla
a843ab955c DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca am: ac8f44e387
am: 3ee26841fd

Change-Id: I7b4d65cc7a3d1b4f575d885e1c71b40a52cc90a4
2017-02-02 03:03:20 +00:00
Suprabh Shukla
3ee26841fd DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca
am: ac8f44e387

Change-Id: I7e4376740ddf167035a3274c19ca5ae3f113a9b0
2017-02-02 02:57:58 +00:00
Suprabh Shukla
674cefc5f5 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca
am: ac8f44e387

Change-Id: I09011dbff8a5126e7323d650a069a979ede7bc64
2017-02-02 02:57:52 +00:00
Jason Monk
87562128ee Merge "QS: Remove circles and add lines" 2017-02-02 02:53:52 +00:00
Suprabh Shukla
ac8f44e387 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505
am: 2f1b2d82ca

Change-Id: I8094afc5c919b65d7f180ef9d3ad875f3ea4dacf
2017-02-02 02:53:21 +00:00
Suprabh Shukla
2f1b2d82ca DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60
am: 029364c505

Change-Id: Ibef494c57a80a7b0d871dd8a80f877816e6897d0
2017-02-02 02:48:23 +00:00
Suprabh Shukla
029364c505 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours
am: 773f85ec60

Change-Id: Ie83cb2dfd89fd808e906a802e16fd1943a898012
2017-02-02 02:43:24 +00:00
Suprabh Shukla
773f85ec60 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab
am: 588411fc7c  -s ours

Change-Id: I1511e5dff681d06161cd18b78e7edaf7eddb897a
2017-02-02 02:38:24 +00:00