Commit Graph

305781 Commits

Author SHA1 Message Date
Hugo Benichi
dfc152bd32 Merge "Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"" into nyc-mr2-dev-plus-aosp
am: c23ff1d477

Change-Id: I9161929f3a7308be4764dbb50e443a46fdc4960c
2017-02-02 21:05:11 +00:00
Hugo Benichi
f0d5ce73fe Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"
am: 6776f79012  -s ours

Change-Id: I80ce623da40db32faa3bef88ee2612a1a163e777
2017-02-02 21:05:00 +00:00
Abodunrinwa Toki
fafdb7372f Fix TextClassifier.getTextClassificationResult()
Gracefully handles situations where a default app cannot be found
to handle the intent.

1. If we can not find any app to handle the intent,
   do not include an "assist" menu item entry to fire the intent.
   Also, do not linkify the entry.
2. If we do not have a default app to handle the intent,
   show a generic title for apps that will handle the intent
   and do not include an icon.

In the ideal case where we find a default app to include the intent,
show the app's (preferably activity's) title and icon.

Test: Manually tested. There's an AI to write more automated tests.
Bug: 34777322
Bug: 34927631
Change-Id: Ia94efbbdda3da8f181fac9228cd2d3a76cb727d3
2017-02-02 20:35:51 +00:00
Geoffrey Pitsch
580f32d7b0 Merge "SystemUI uses Builder API with NotificationChannel" 2017-02-02 20:25:48 +00:00
TreeHugger Robot
e8ae5566fb Merge "Batterystats commands to simulate screen on/off" 2017-02-02 20:05:45 +00:00
TreeHugger Robot
1feb6cefd1 Merge "AudioService: query a11y manager at init for a11y volume active" 2017-02-02 20:05:20 +00:00
TreeHugger Robot
42ad9aabe3 Merge "Fixing crash when task is already parent of activity." 2017-02-02 20:05:02 +00:00
Erik Kline
e8bc75bfcc Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259 am: 7196e935a8
am: c700509ade

Change-Id: I15fe6fe4c9aec3d244b46516c2992ded33337a9f
2017-02-02 20:03:51 +00:00
Hugo Benichi
b81bc507ff Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792
am: 814a59ba82  -s ours

Change-Id: Iafa147a12cfa9ba559458c72ab47553c847cd115
2017-02-02 20:02:40 +00:00
TreeHugger Robot
62e1a05076 Merge "Alert Windows behavioral changes" 2017-02-02 19:47:29 +00:00
Winson Chung
ba7db92d16 Fixing crash when task is already parent of activity.
- When launching an activity into a task, it's parent is already set
  which can cause the reparent call to crash.  Instead, just move the
  activity to the top.

Bug: 34933399
Test: Launch an app that doesn't support multiwindow, and engage split
      screen, or launch a PiP activity and tap to show the menu

Change-Id: Iaa36003e88f4021f2483dedc71802023369d6558
2017-02-02 19:43:54 +00:00
TreeHugger Robot
c21f12d4eb Merge "Add hidden KeyProtection API to specify SID" 2017-02-02 19:39:45 +00:00
TreeHugger Robot
c54e1a6017 Merge "TextClassificationManager: Make certain methods thread-safe" 2017-02-02 19:13:45 +00:00
Chad Brubaker
aea3ec67a2 Merge "Allow ephemeral apps to reach any CATEGORY_BROWSABLE" 2017-02-02 19:08:00 +00:00
Diego Perez
66f66e802e Merge "Update native delegates" 2017-02-02 18:29:38 +00:00
Anthony Chen
b3f0849c3e Merge "Refactor notification to allow for overlay by Android Auto." 2017-02-02 18:09:43 +00:00
TreeHugger Robot
e70ef857fb Merge "Fix leaks in sysui" 2017-02-02 18:08:29 +00:00
TreeHugger Robot
61d7a8a7f5 Merge "port status bar logs to Tron V2" 2017-02-02 18:07:56 +00:00
Hangyu Kuang
48a3cb6984 Merge "media: Add 3gpp output format to MediaMuxer." 2017-02-02 18:07:22 +00:00
Rubin Xu
59ced28f0f Add hidden KeyProtection API to specify SID
Allows the caller to specify which SID the given key
should be bound to, overriding the default rule of
binding to the current root/fingerprint SID.

This is a prerequsite for introducing synthetic password
based authentication flow.

Test: cts-tradefed run cts -m CtsKeystoreTestCases
Bug: 33126414
Change-Id: Ide03c0f4fd33ecca7a169ea763c3d4d0b173d1dd
2017-02-02 17:53:32 +00:00
Abodunrinwa Toki
4039454f6f TextClassificationManager: Make certain methods thread-safe
1. getDefaultTextClassifier()
2. getLanguageDetector()

Test: CtsWidgetTestCases passes
Change-Id: Ie0cb866cdefea2839efb38a1113e434a3e8159b0
2017-02-02 17:16:36 +00:00
TreeHugger Robot
ddb80216b9 Merge "Addition separation of adding vs. reparenting activity" 2017-02-02 16:58:57 +00:00
Diego Perez
2a1b23966a Update native delegates
After changes 9ff994d988, 6e3658a638 and 18e9f9f377
Test: Existing layoutlib tests

Change-Id: I8e39f26ccb0a8cb73a724f16734e66cf95c08656
2017-02-02 16:53:18 +00:00
Erik Kline
ee929e69fb Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8 am: d85f448274
am: 2ebea21074

Change-Id: I2e0ab82edd8997188c8c16dce6373ccb19657e3d
2017-02-02 16:52:43 +00:00
Wale Ogunwale
5cd907d3d6 Alert Windows behavioral changes
- Introduced TYPE_APPLICATION_OVERLAY window type. Can be used by apps
to display windows on top of other app windows, but below critical
system windows.
- Deprecate alert window types TYPE_PHONE, TYPE_SYSTEM_ALERT,
TYPE_SYSTEM_OVERLAY, TYPE_PRIORITY_PHONE, and TYPE_SYSTEM_ERROR.
Apps should now use TYPE_APP_OVERLAY for this.
- Apps targetting O or greater are not allowed to add the old alert
window types.
Apps targetting less than O can still add the old types.
Apps with permission INTERNAL_SYSTEM_WINDOW (system signature apps) can
still add the old types.
- Z-order old alert windows types below TYPE_APPLICATION_OVERLAY if
they are added by an app without the INTERNAL_SYSTEM_WINDOW permission.

Test: android.server.cts.AlertWindowsTests
Bug: 33256752
Change-Id: I12170955a7a333151d3387c169b51c53c32164fc
2017-02-02 08:20:49 -08:00
Jerome Gaillard
abf19d1aa4 Merge changes Ic8254f0f,I1f285c3b
* changes:
  Ignore justified in layoutlib for the moment
  Update Canvas_Delegate after Change I3edc963a
2017-02-02 16:12:26 +00:00
Geoffrey Pitsch
1dc93bc407 SystemUI uses Builder API with NotificationChannel
Some changes to channels based on UX feedback.

Test: runtest systemui
Change-Id: I1b2f661ba145d6926035f992231dc3c2f8cbf844
2017-02-02 11:12:05 -05:00
TreeHugger Robot
8308526d88 Merge "Framework: Preloaded-classes tuning" 2017-02-02 16:07:43 +00:00
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
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
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
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
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