Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
366,117 Commits 3 Branches 0 Tags
6c4decc9bb6629b7cf8d4bc7c660d53cf4fc48bf
Commit Graph

89697 Commits

Author SHA1 Message Date
Suprabh Shukla
6c4decc9bb Merge "Guarding collisions in TimeSparseArray" into pi-dev am: 6da53af9c5 
am: b334f1b2e9

Change-Id: I7e65cc4b1caa08b8303fd2c4db1fe7e0cf0b2481
 2018-03-24 22:57:56 +00:00
Suprabh Shukla
b334f1b2e9 Merge "Guarding collisions in TimeSparseArray" into pi-dev 
am: 6da53af9c5

Change-Id: Ic8ba83876a867fc57100b33b47cd8ef51be39dfe
 2018-03-24 22:49:37 +00:00
TreeHugger Robot
6da53af9c5 Merge "Guarding collisions in TimeSparseArray" into pi-dev 2018-03-24 22:36:21 +00:00
Seigo Nonaka
f6be26ca20 Merge "Fix BoringLayout with PrecomputedText" into pi-dev am: 5dbb3fe124 
am: 18f36b076d

Change-Id: Idb0a74af56294eb8eb4efd26575bad92a6a4870e
 2018-03-24 21:34:22 +00:00
Seigo Nonaka
18f36b076d Merge "Fix BoringLayout with PrecomputedText" into pi-dev 
am: 5dbb3fe124

Change-Id: Idd0927134ecf65e42ee53d0898a149ce66bc30e2
 2018-03-24 21:20:11 +00:00
TreeHugger Robot
5dbb3fe124 Merge "Fix BoringLayout with PrecomputedText" into pi-dev 2018-03-24 21:03:31 +00:00
TreeHugger Robot
ca697c621e Merge "Pass all relevant resolver info to netd" into pi-dev 2018-03-24 15:58:42 +00:00
Martijn Coenen
fdc6f30be2 Merge "Add new trace tag for AIDL." into pi-dev am: 96b341e43a 
am: 7b436db89c

Change-Id: Id4f1cd0ff4dbe8a024095564bf38617cc0571f15
 2018-03-24 07:30:34 +00:00
Nathan Harold
004892751a Merge changes from topic "data-service-grant-policy" into pi-dev am: 775e291c2e 
am: 177b9bc016

Change-Id: I774a5f44ab4e633da983165bfdf0eb9b9c21062a
 2018-03-24 07:18:03 +00:00
Dmitry Dementyev
1aeafe3251 Merge "Add more NonNull annotations to RecoveryController API" into pi-dev am: ea97f89048 
am: fdb48b6ebb

Change-Id: Ie0af325463934c440151afacb1a729569c487af9
 2018-03-24 06:56:53 +00:00
Martijn Coenen
7b436db89c Merge "Add new trace tag for AIDL." into pi-dev 
am: 96b341e43a

Change-Id: I925f2dd25d8fab1ddbef77e69778b7b07c4c1120
 2018-03-24 06:17:31 +00:00
Martijn Coenen
96b341e43a Merge "Add new trace tag for AIDL." into pi-dev 2018-03-24 05:58:25 +00:00
Dmitry Dementyev
4cfbeac710 Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev am: 9cd3e43d86 
am: 49510c9b00

Change-Id: Ib757cfe6cbdf209476d33398ecb0e93ed5904856
 2018-03-24 05:35:31 +00:00
Andrii Kulian
2b55287fe5 Merge "Revert "Use transaction for local activity relaunch"" into pi-dev am: 603b911e48 
am: 7558a0b30c

Change-Id: Ic7c7b699f217e69ed6f6f852145fe276f4a8c49c
 2018-03-24 05:25:18 +00:00
Nathan Harold
177b9bc016 Merge changes from topic "data-service-grant-policy" into pi-dev 
am: 775e291c2e

Change-Id: I9e247071614faa673057335844a6d51bcbc43b8d
 2018-03-24 05:13:23 +00:00
Nathan Harold
775e291c2e Merge changes from topic "data-service-grant-policy" into pi-dev 
* changes:
  Add Permissions Grant for TelephonyDataService
  Add a Method to Revoke DefaultGrant Permissions
 2018-03-24 05:00:42 +00:00
Erik Kline
117e7f3c76 Pass all relevant resolver info to netd 
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit e5dac904d3)
 2018-03-23 21:59:24 -07:00
Wale Ogunwale
0cc85cd5f4 Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp 
am: cd6eae6cce

Change-Id: Id6e530efea409379ac882843824baaf3260cb264
 2018-03-24 04:54:12 +00:00
Erik Kline
17d4e7fa69 Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp 
am: 361e903c66

Change-Id: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
 2018-03-24 04:29:06 +00:00
Dmitry Dementyev
fdb48b6ebb Merge "Add more NonNull annotations to RecoveryController API" into pi-dev 
am: ea97f89048

Change-Id: I53fb3b3d1aca8c3beb63f135c26c0e669e2b91cf
 2018-03-24 04:01:54 +00:00
Robert Carr
cfc0ddf1df Merge "Fix SurfaceView Background" into pi-dev am: e3d2c41344 
am: beb2540414

Change-Id: I1e6bc640843038f41a0b444dd507d884d472a117
 2018-03-24 04:00:58 +00:00
Felipe Leme
d3d26f04aa Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev am: 0049ec1410 
am: abd29040bb

Change-Id: I33538ef226c81fc380fb21f198353f1cde86bfd3
 2018-03-24 02:51:01 +00:00
Felipe Leme
d6878276d9 Merge "Properly set input type on autofill compat mode." into pi-dev am: 352da45bbb 
am: be541db705

Change-Id: I8975c3604122935f84347606a3a21517a7ee05e3
 2018-03-24 02:06:48 +00:00
Dmitry Dementyev
49510c9b00 Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev 
am: 9cd3e43d86

Change-Id: Iec63cea0f5657aa763a45e7bbd8a21479459c892
 2018-03-24 01:53:05 +00:00
Andrii Kulian
7558a0b30c Merge "Revert "Use transaction for local activity relaunch"" into pi-dev 
am: 603b911e48

Change-Id: I9443d43e9758916eb2ec6721c1ca9992bd7b9d87
 2018-03-24 01:44:46 +00:00
Todd Kopriva
56a99d5ff6 Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev am: ba22b7f4fd 
am: 1e72ce692a

Change-Id: I9741c3ba70d229e389fb2c4e068a576a9b6007a6
 2018-03-24 01:44:05 +00:00
Android Build Merger (Role)
cd6eae6cce Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp 2018-03-24 01:22:24 +00:00
Wale Ogunwale
21315b15b7 Merge "Don't show unsupported sdk warning in test harness." into pi-dev 
am: 444885b10d

Change-Id: I750ffef919badf38d759a32b1067702692d2a9c2
 2018-03-24 01:21:39 +00:00
Seigo Nonaka
53145635e4 Fix BoringLayout with PrecomputedText 
The special logic for PrecomputedText in BoringLayout has problem.
The special logic is no longer necessary since TextLine is now aware of
PrecomputedText. So, just removing special logic from BoringLayout.

On the other hand, the metrics parameters check in TextLine has removed
Ie73bce52c6c673cda58973ddad04627a7cf2e5e9, but that was wrong. TextLine
can be used by BoringLayout too. Thus, need to reject PrecomputedText
if the given TextPaint is not compatible with given param.

Bug: 76227465
Test: atest CtsWidgetTestCases:EditTextTest
    CtsWidgetTestCases:TextViewFadingEdgeTest
    FrameworksCoreTests:TextViewFallbackLineSpacingTest
    FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
    CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
    CtsTextTestCases FrameworksCoreTests:android.text
    CtsWidgetTestCases:TextViewPrecomputedTextTest

Change-Id: I172b5f655402e797b53b9667b49cb4ab89ec0dc0
 2018-03-23 18:19:06 -07:00
Android Build Merger (Role)
361e903c66 Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp 2018-03-24 01:17:12 +00:00
Erik Kline
2b708b55a9 Merge "Pass all relevant resolver info to netd" am: 76f64641bb 
am: 3ce3bc4582

Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
 2018-03-24 01:16:37 +00:00
Robert Carr
beb2540414 Merge "Fix SurfaceView Background" into pi-dev 
am: e3d2c41344

Change-Id: I95471b28f40446925c41a3a332f324168bbe0309
 2018-03-24 01:12:02 +00:00
Erik Kline
3ce3bc4582 Merge "Pass all relevant resolver info to netd" 
am: 76f64641bb

Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc
 2018-03-24 01:07:10 +00:00
Evan Rosky
1069c90060 Merge "Added TestApi for default focus highlight" into pi-dev am: 87f9818319 
am: a6afc381c9

Change-Id: I034e076aa41e3866b84e19261132450991d9488d
 2018-03-24 00:54:19 +00:00
Felipe Leme
abd29040bb Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev 
am: 0049ec1410

Change-Id: I815bf3aa060005b8c3f0512e38042ae377c8e236
 2018-03-24 00:53:12 +00:00
Suprabh Shukla
2811d92483 Guarding collisions in TimeSparseArray 
TimeSparseArray - used to store UsageEvents - can keep at most one event
per millisecond, which can result in an event being replaced by another
event that occurred close enough that the system records it at the same
millisecond.

Test: atest android.app.usage.TimeSparseArrayTest

Fixes: 73832306
Change-Id: I860a101ab098f65d5c5832758832f43572865690
 2018-03-23 17:51:20 -07:00
Dmitry Dementyev
0bbaf189c2 Add more NonNull annotations to RecoveryController API 
Bug: 73959762
Test: none
Change-Id: I648c20a099d4ac1c002f4f467d7189a8bc019560
 2018-03-23 17:36:58 -07:00
Dmitry Dementyev
9cd3e43d86 Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev 2018-03-24 00:10:30 +00:00
Felipe Leme
be541db705 Merge "Properly set input type on autofill compat mode." into pi-dev 
am: 352da45bbb

Change-Id: I7b97497e1d4dfb755e4f49182e27251356d9c372
 2018-03-24 00:03:23 +00:00
Treehugger Robot
76f64641bb Merge "Pass all relevant resolver info to netd" 2018-03-23 23:41:11 +00:00
Todd Kopriva
1e72ce692a Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev 
am: ba22b7f4fd

Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8
 2018-03-23 23:36:28 +00:00
Andrii Kulian
603b911e48 Merge "Revert "Use transaction for local activity relaunch"" into pi-dev 2018-03-23 23:36:02 +00:00
Wale Ogunwale
444885b10d Merge "Don't show unsupported sdk warning in test harness." into pi-dev 2018-03-23 23:32:54 +00:00
TreeHugger Robot
e3d2c41344 Merge "Fix SurfaceView Background" into pi-dev 2018-03-23 23:21:04 +00:00
TreeHugger Robot
0049ec1410 Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev 2018-03-23 23:18:27 +00:00
Richard Ledley
6a29d0772d Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev 
am: 525b182864

Change-Id: I57974b8dc2b55d938ed48760654936d4bce61b11
 2018-03-23 23:16:18 +00:00
Evan Rosky
a6afc381c9 Merge "Added TestApi for default focus highlight" into pi-dev 
am: 87f9818319

Change-Id: I039252a404149a979617d71b2c08f679e025d692
 2018-03-23 23:01:19 +00:00
Robert Berry
a0696a6f9c Merge "Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev am: 73b7722c13" into pi-dev-plus-aosp 
am: 2220061b45

Change-Id: I6bd7211be02e0cf755f8b88f13558c16a83bc62f
 2018-03-23 22:55:30 +00:00
TreeHugger Robot
352da45bbb Merge "Properly set input type on autofill compat mode." into pi-dev 2018-03-23 22:49:25 +00:00
John Reck
477ea0674c Merge "Add isPivotSet/resetPivot" into pi-dev am: 6045d66aa2 
am: 530d626b81

Change-Id: I592dd6459b9526393602d9845d0191c291f56cb6
 2018-03-23 22:14:45 +00:00