Commit Graph

56208 Commits

Author SHA1 Message Date
Michal Karpinski
30d7eb9f1c Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am: 810c312a29
am: c2e30cd5c9

Change-Id: If613847830b9fc820838e685ba2e57dadaae0765
2017-07-31 19:14:16 +00:00
Bryce Lee
2c931c9e98 Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am: 1fd7497f02
am: 343d82adf6

Change-Id: Id708764483b96ff77e9de23e4dd64c365bcf60c5
2017-07-31 19:07:16 +00:00
Michal Karpinski
c2e30cd5c9 Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am: 810c312a29

Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
2017-07-31 19:03:13 +00:00
Bryce Lee
94795bcaf8 Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12
am: 05865fb40a

Change-Id: Ia5817040ce14ee6dbd995bd83444f34e78bef375
2017-07-31 18:53:39 +00:00
TreeHugger Robot
810c312a29 Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev 2017-07-31 18:51:17 +00:00
Bryce Lee
343d82adf6 Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am: 1fd7497f02

Change-Id: Ibc6ea27ae4e813e3430ea75c8c26057f6bec2304
2017-07-31 18:50:32 +00:00
Bryce Lee
05865fb40a Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am: 33d4702a12

Change-Id: I990a3554730cc07440c7d4bc0236e0aeb00e2980
2017-07-31 18:46:20 +00:00
Bryce Lee
69aac0a7b6 Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am: 33d4702a12

Change-Id: Id6748aab9ee83844303324ea397d4ac699fb5839
2017-07-31 18:45:19 +00:00
Bryce Lee
1fd7497f02 Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev 2017-07-31 18:34:23 +00:00
Bryce Lee
658d984f04 Do not call onConfigurationChanged for appBound position changes.
Since appBounds encodes both dimensions and positions, movement will
cause a diff change. This happens in situations where the dimensions
stay constant, such as dragging a PiP window around.

To avoid flooding the client side with configuration changes, this CL
checks whether the new configuration is equivalent to the existing
configuration with the exception of the position of the appBounds
before sending to the registered callbacks.

Change-Id: I8fbc94458fd9ed3b39494c3587f25e704ec02a7d
Fixes: 63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke
2017-07-31 08:46:00 -07:00
Bryce Lee
00d586d8f0 Allow foreground AppWindowToken to influence orientation.
It is possible for an activity to request an orientation after
finish has been called, causing the system orientation to be
re-evaluated. Since the activity is closing, it will no longer be
eligible to influence orientation. If another stack/task is brought
to the foreground, it will as well won't be able to participate
since it is not considered an opening app and won't be visible. As a
result, we set the orientation to unspecified, leading to the
foreground activity to be resumed in the wrong orientation.

This changelist addresses the issue by allowing an AppWindowToken to
participate in orientation calculations if it is not closing and is
on top of the wm hierarchy, regardless of its visibility.

Change-Id: I0f316d6d824398d084c7648cf2dc2c2d07b4410d
Fixes: 63982461
Fixes: 63513655
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests#testGetOrientation
Test: go/wm-smoke
2017-07-31 08:24:23 -07:00
Neil Fuller
2d196d97f6 Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e am: b65356709e am: 452dcfce41
am: 9fadf818c6

Change-Id: I258b27a87297cae46218991df26f10f91ac5ae12
2017-07-31 13:29:53 +00:00
Neil Fuller
9fadf818c6 Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e am: b65356709e
am: 452dcfce41

Change-Id: I699962dee85ff318433004cd91f183c0630e3888
2017-07-31 13:21:41 +00:00
Neil Fuller
452dcfce41 Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e
am: b65356709e

Change-Id: Icbc33207a154b566791210d6c6169235c139562a
2017-07-31 13:06:44 +00:00
Neil Fuller
b65356709e Merge "Remove redundant TODOs from PackageTracker"
am: 01d686b85e

Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be
2017-07-31 13:00:50 +00:00
Neil Fuller
01d686b85e Merge "Remove redundant TODOs from PackageTracker" 2017-07-31 12:51:05 +00:00
Hugo Benichi
88a572da7d Merge "Logging improvements when NetworkCapabilities change" am: f60a38e152
am: bdfb4ee19c

Change-Id: Ie7f90ac6b8073e756ff14afcaac7ed291b165e87
2017-07-31 01:58:33 +00:00
Hugo Benichi
bdfb4ee19c Merge "Logging improvements when NetworkCapabilities change"
am: f60a38e152

Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
2017-07-31 01:50:38 +00:00
Treehugger Robot
f60a38e152 Merge "Logging improvements when NetworkCapabilities change" 2017-07-31 01:38:29 +00:00
Hugo Benichi
eae7a22944 Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c

(cherry pick from commit 683ea489d3)

Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
2017-07-31 09:25:37 +09:00
Rajeev Kumar
21458d9a38 Merge "Add more variations of subscription plan to the fake subscription plan list." into oc-mr1-dev
am: a20bf80aa3

Change-Id: I794aa19a079c687de5d532a710e250984ba2928a
2017-07-30 00:22:53 +00:00
TreeHugger Robot
a20bf80aa3 Merge "Add more variations of subscription plan to the fake subscription plan list." into oc-mr1-dev 2017-07-30 00:18:21 +00:00
Jeff Sharkey
284eab179c Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81
2017-07-30 00:15:17 +00:00
TreeHugger Robot
2c131cafae Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev 2017-07-30 00:09:04 +00:00
Jeff Sharkey
d09d7006c2 Merge "Add a missing null check" into oc-dev am: 101fca656d am: ea99954804
am: 567fe364d4

Change-Id: I9f2b25bf6f45a711b1cf18ca473a1f545ceb7cef
2017-07-29 16:17:08 +00:00
Jeff Sharkey
567fe364d4 Merge "Add a missing null check" into oc-dev am: 101fca656d
am: ea99954804

Change-Id: If4d45586afd4dde05a3aad10d25f73afdcc3e92d
2017-07-29 16:11:35 +00:00
Jeff Sharkey
a8f3b3d774 Merge "Add a missing null check" into oc-dev am: 101fca656d
am: ea99954804

Change-Id: I3c81e5f426d6f4e41914b5f35803dd35ccc47710
2017-07-29 16:11:32 +00:00
Jeff Sharkey
ea99954804 Merge "Add a missing null check" into oc-dev
am: 101fca656d

Change-Id: Iab72d9b62042ab5ceb0d32425b43796d3bdeb1ca
2017-07-29 16:04:02 +00:00
Jeff Sharkey
d56b01e022 Merge "Add a missing null check" into oc-dev
am: 101fca656d

Change-Id: Ifa868b17837796dec93c93119260a92f4241f624
2017-07-29 16:04:02 +00:00
Hugo Benichi
0cad8d2e14 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 6e269ec6fe
am: 6992f4edb3

Change-Id: Iec6d92e9a3a12bab87c5adfaf17f776465077060
2017-07-29 00:03:27 +00:00
Hugo Benichi
359f2215eb Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
am: 6e269ec6fe

Change-Id: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
2017-07-28 23:54:05 +00:00
Hugo Benichi
6992f4edb3 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
am: 6e269ec6fe

Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
2017-07-28 23:54:03 +00:00
Hugo Benichi
6e269ec6fe Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev 2017-07-28 23:42:59 +00:00
Jeff Sharkey
b7479988d2 Migrate plans to @SystemApi, evolve permissions.
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead.  Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.

Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.

Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier.  Also fix
NPE when SubscriptionInfo is missing.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 63997177, 63928277, 64156138, 63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4
2017-07-28 16:59:14 -06:00
Svet Ganov
0ae9570c99 Add a missing null check
Test: manual

bug::62755026

Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09
2017-07-28 22:41:45 +00:00
Svet Ganov
46bbd79b0e Handle case for missing permissions - fix NPE am: 39cc33f192 am: 6e527d0ec5
am: 88414961ab

Change-Id: I6102ea1698eaa2e249deb9e64f8ec166e27d6eed
2017-07-28 22:19:47 +00:00
Svet Ganov
a2ab662f9b Handle case for missing permissions - fix NPE am: 39cc33f192
am: 6e527d0ec5

Change-Id: I1ac6a0714fe2b466e313c337183097640deb4d58
2017-07-28 21:55:11 +00:00
Bryce Lee
96d54d41f4 Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev am: 5b76ce1b2b
am: d6dfd4a8b4

Change-Id: I38aeed5d2ab2cf7932e98e97800fa1cd73c7a3ec
2017-07-28 21:47:21 +00:00
Svet Ganov
88414961ab Handle case for missing permissions - fix NPE am: 39cc33f192
am: 6e527d0ec5

Change-Id: Ic15a4d3e5c71cf73957c10789e1cfb8c9353ea78
2017-07-28 21:30:58 +00:00
Bryce Lee
84fa183e7d Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
am: 5b76ce1b2b

Change-Id: Ibf899e9a08cdab31ae38897add813fc4c8089474
2017-07-28 21:28:05 +00:00
Svet Ganov
c200689d6c Handle case for missing permissions - fix NPE
am: 39cc33f192

Change-Id: I5fc2ebc009baa242bf9848af62a8f9231afa8045
2017-07-28 21:23:04 +00:00
Svet Ganov
6e527d0ec5 Handle case for missing permissions - fix NPE
am: 39cc33f192

Change-Id: I8fd46e293a25ddf83346950e8e700ec9d61e2263
2017-07-28 21:22:57 +00:00
Svet Ganov
39cc33f192 Handle case for missing permissions - fix NPE
Test: manual

Bug:62755026

Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8
2017-07-28 20:25:56 +00:00
Michael Wright
619835e5e3 Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev
am: c541380f91

Change-Id: I990aff4628736eb733b8fca80a1cbc7c2424363a
2017-07-28 18:44:22 +00:00
TreeHugger Robot
c541380f91 Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev 2017-07-28 18:32:59 +00:00
Bryce Lee
d6dfd4a8b4 Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
am: 5b76ce1b2b

Change-Id: I8386f0693d79708b4d32bb7108139a75e273eeb1
2017-07-28 18:18:52 +00:00
Bryce Lee
5b76ce1b2b Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev 2017-07-28 17:57:09 +00:00
Todd Kennedy
381c79336c Merge "Allow the launcher to get all instant apps" into oc-mr1-dev
am: f8c35ac848

Change-Id: I0e170e7111e82116e60f5620e467d7e0378d8d50
2017-07-28 17:30:23 +00:00
TreeHugger Robot
f8c35ac848 Merge "Allow the launcher to get all instant apps" into oc-mr1-dev 2017-07-28 17:23:21 +00:00
Svetoslav Ganov
bd0cf0ab06 Merge "Report permission flags for all protections based on SDK am: adb8c522a8 am: fc862c9f86" into oc-dr1-dev-plus-aosp
am: bccc7625ec

Change-Id: Idf1e289d5e70246433e5eccf286026b48e57282f
2017-07-28 17:06:59 +00:00