Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
365,202 Commits 3 Branches 0 Tags
fcc07b53fa0423610fbde4b935be9f12dfd710eb
Commit Graph

365202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
fcc07b53fa Merge "Don't process broadcasts until really ready." into pi-dev 2018-04-13 23:03:17 +00:00
TreeHugger Robot
fd56770fb6 Merge "Add constant for bluetooth fragment" into pi-dev 2018-04-13 23:00:51 +00:00
Brad Ebinger
4558c77d5d Merge "Update Docs to clarify using a Message across IPC" into pi-dev 2018-04-13 21:35:13 +00:00
Brad Ebinger
63a6bc6794 Merge "Adds a private field to parceled data." into pi-dev 2018-04-13 21:34:37 +00:00
y
19c4ef269f [automerger skipped] [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 am: 86cfcaa610 am: 4f5e234020 
am: 5604680766  -s ours

Change-Id: I1ff6265b401704800f7be276034cb9cc720c94ec
 2018-04-13 14:24:24 -07:00
Chavi Weingarten
5e09e0a34b Merge "Don't update crop WSA when drag resizing so screenshots are correct." into pi-dev 2018-04-13 21:14:16 +00:00
y
5604680766 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 am: 86cfcaa610 
am: 4f5e234020

Change-Id: Iedf59329ed35149cec2143e8f179c7912534a41d
 2018-04-13 14:08:07 -07:00
Salvador Martinez
7a9564f507 Add constant for bluetooth fragment 
simply adds a metrics constant for the new bluetooth screen

Bug: 77543471
Test: robotests pass
Merged-In: Id6317df4b86def4e0aa095fd3bc1ed544c0f0220
Change-Id: Id6317df4b86def4e0aa095fd3bc1ed544c0f0220
 2018-04-13 14:04:50 -07:00
y
4f5e234020 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 
am: 86cfcaa610

Change-Id: I6d37d24fd14271d24595c380ea553cb37948fa9e
 2018-04-13 13:57:36 -07:00
Wale Ogunwale
51c1904b95 Merge changes from topic "bumping-api" into pi-dev 
* changes:
  Finalizing P SDK
  Finalizing P SDK
 2018-04-13 20:53:03 +00:00
Android Build Merger (Role)
86cfcaa610 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 
Change-Id: I971b589190cae708a08dd568290807dff0f75349
 2018-04-13 20:35:02 +00:00
Android Build Merger (Role)
76d71fa910 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 
Change-Id: Ibeb5d99f477048e8715a0d4b093052f3d88445e2
 2018-04-13 20:34:58 +00:00
Android Build Merger (Role)
80e36faa72 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba 
Change-Id: I48bf9619571a30e6f5ea5bad503a3805e0821a75
 2018-04-13 20:34:53 +00:00
Android Build Merger (Role)
a509e771ba [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 
Change-Id: I068f51adbb0248db232c50bd89fb25ef0d7273a9
 2018-04-13 20:34:49 +00:00
Android Build Merger (Role)
79d0fb2530 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa 
Change-Id: I61c158947f3508aab9ef65988267562663c97a21
 2018-04-13 20:34:44 +00:00
Android Build Merger (Role)
927b3357fa [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 
Change-Id: I24a1df41eb29a6ac7e6c67368f07c6702dacf071
 2018-04-13 20:34:34 +00:00
TreeHugger Robot
a991071db9 Merge "Reduce disk space limit for incident reports." into pi-dev 2018-04-13 20:34:31 +00:00
Android Build Merger (Role)
d85632ae40 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 
Change-Id: Ia175db4206119bed5e1a6b1aeeff72ae86489d38
 2018-04-13 20:34:29 +00:00
Android Build Merger (Role)
24a89da344 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 
Change-Id: I0a5c57b7a50d9221b3be4d193388ac610ba92f73
 2018-04-13 20:34:24 +00:00
Android Build Merger (Role)
98e2d2ec50 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 
Change-Id: I57e2ea2122d22341c43b9b445291cc4b02ec2b11
 2018-04-13 20:34:20 +00:00
y
7e54c3f261 ResStringPool: Fix security vulnerability 
Adds detection of attacker-modified size and data fields passed to
ResStringPool::setTo(). These attacks are modified apks that AAPT would
not normally generate. In the rare case this occurs, the installation
cannot be allowed to continue.

Bug: 71361168
Bug: 71360999
Test: run cts -m CtsAppSecurityHostTestCases \
          -t android.appsecurity.cts.CorruptApkTests

Change-Id: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
Merged-In: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
 2018-04-13 20:34:18 +00:00
Etan Cohen
0e100add48 Merge "[RTT] Wi-Fi RTT Metrics" into pi-dev 2018-04-13 20:29:22 +00:00
Jeff Sharkey
050151e052 Don't process broadcasts until really ready. 
Someone started setting mSystemReady too early, when we really want
to know SystemServer's real ready state.  Add a variable to track
that, and don't process broadcasts until that's set.

Bug: 78020762
Test: builds, boots
Change-Id: I65213e46044c95fb0a8a4b09b9aa463bb15c1844
 2018-04-13 14:28:32 -06:00
Jason Parks
a668c66301 Merge "Allow Device Owners/Profile Owners to set the interruption filter." into pi-dev 2018-04-13 19:56:20 +00:00
TreeHugger Robot
3ab97957fe Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 19:42:18 +00:00
TreeHugger Robot
75bb177d95 Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev 2018-04-13 19:31:52 +00:00
TreeHugger Robot
589bdcd1f6 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 18:47:30 +00:00
Jovana Knezevic
027a967389 Merge "Prevents showing Guests in switcher." into pi-dev 2018-04-13 17:49:32 +00:00
TreeHugger Robot
72634cae72 Merge "Add optional metadata to specify icon's background color." into pi-dev 2018-04-13 17:48:22 +00:00
TreeHugger Robot
f2799545f5 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:44:39 +00:00
Ryan Mitchell
3ddd801449 Merge "AAPT2: GetBag infinite recursion fix" into pi-dev 2018-04-13 17:44:11 +00:00
TreeHugger Robot
7e41f31bc2 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:42:03 +00:00
TreeHugger Robot
b6134dc727 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:41:09 +00:00
TreeHugger Robot
04543e7ab3 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:40:15 +00:00
TreeHugger Robot
2e9addbad7 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:38:13 +00:00
TreeHugger Robot
04e0ef903e Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:36:14 +00:00
TreeHugger Robot
213639c93e Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:34:19 +00:00
Michael Wright
ca1dcfb23e Merge "Revert "Fixed power manager CTS test."" into pi-dev 2018-04-13 17:33:15 +00:00
Michael Wright
4d6b454b45 Revert "Fixed power manager CTS test." 
This reverts commit 48fed61da3.

Reason for revert: m checkbuild failing
Bug: 77907164

Change-Id: I7f75dafc049581a7a5393c3cf0108c488eecaf48
 2018-04-13 17:32:11 +00:00
TreeHugger Robot
07d10c7ac5 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-13 17:31:19 +00:00
Bill Yi
7d0af513c0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4b4d9e11273bc8d2fa97a86e8f9b71d7c05f6b8c
 2018-04-13 10:10:39 -07:00
TreeHugger Robot
62444d4950 Merge "Fixed power manager CTS test." into pi-dev 2018-04-13 16:59:28 +00:00
chaviw
9513662194 Don't update crop WSA when drag resizing so screenshots are correct. 
When drag resizing, there's no need to recalculate the crop for
the WSA since it will not be affected by the decor frame.
This is needed to prevent incorrect screenshots when drag
resizing. So for example, if the app was in split screen and
then the user dragged the divider to exit split screen, the WSA
would crop the area where the nav bar is and below. This would cause
the screenshot to get cropped, only showing the area that was last
computed by setSurfaceBoundariesLocked. This isn't necessary since
in drag resizing, the WSA hasn't redrawn yet so there's no need to
recalculate the crop for the area under the nav bar.

Bug: 76442549
Test: Enter split screen. Drag divider to exit. Ensure recents
screenshot is correct and not cropped.

Change-Id: If7f2639794a0c3a20353d40fe31ef9bb9a051e41
 2018-04-13 09:41:34 -07:00
Winson Chung
9f54f109bb Merge "Initialize the animation leash with the current values" into pi-dev 2018-04-13 16:41:18 +00:00
Lifu Tang
b3ac00ea9c Merge "Mark location-related PendingIntents as restricted" into pi-dev 2018-04-13 16:30:40 +00:00
y
57cd195c43 AAPT2: GetBag infinite recursion fix 
Style resources with circular parental dependencies caused infinite
recursion when calling AssetManager2::GetBag. This fix allows recursion
to cease when a circular dependency is found.

Bug: 77928512
Change-Id: Ib900c36ab1aef5da5b03234a9484c4dad3b63c02
Test: Manual test of b/77928512 and duplicates of 74493983
 2018-04-13 08:50:09 -07:00
TreeHugger Robot
a4e8196cf8 Merge "Don't show ringer status if dnd overrides it" into pi-dev 2018-04-13 15:43:22 +00:00
David Brazdil
d55a940e9f Merge "Add more hidden API on light greylist" into pi-dev 2018-04-13 14:46:47 +00:00
Dan Gittik
48fed61da3 Fixed power manager CTS test. 
Added an annotation necessary to allow the power manager CTS test to
access the non-public method nap.

Test: adb install -r \
      out/host/linux-x86/cts/android-cts/testcases/CtsOsTestCases.apk
      adb shell am instrument -e class android.os.cts.PowerManagerTest \
      -w android.os.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I91e591be608f5040bc035a203d7e94c83d50bf15
Fixes: 77907164
 2018-04-13 15:43:20 +01:00
TreeHugger Robot
e791b67448 Merge "Protect slice permissions text" into pi-dev 2018-04-13 13:40:10 +00:00