drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
374,057 Commits 1 Branch 0 Tags
Commit Graph

374057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathew Inwood
ffc8ebefca Merge "Merge generated greylists into final greylist." 
am: aa863ca68e

Change-Id: Ia2686a52c5f53f7a82d6dfb70c5c9cf9430443dd
 2018-07-26 01:43:37 -07:00
Mathew Inwood
aa863ca68e Merge "Merge generated greylists into final greylist." 2018-07-26 07:37:29 +00:00
Olivier Gaillard
6722abdede Merge "Disable generating Binder#getTransactionName." 
am: 9119e2e49d

Change-Id: Ic2a31bee9e6768c227dd6de8e2500e9e13f77ecf
 2018-07-25 13:36:45 -07:00
Steven Moreland
77cc79264e Merge "Fix order of hidl unlinkToDeath." 
am: 720d797c0a

Change-Id: I510a2a7d311471cb259c0857059bb9fe6c99a7e9
 2018-07-25 12:29:53 -07:00
Treehugger Robot
9119e2e49d Merge "Disable generating Binder#getTransactionName." 2018-07-25 18:31:22 +00:00
Steven Moreland
720d797c0a Merge "Fix order of hidl unlinkToDeath." 2018-07-25 18:12:27 +00:00
Vu Thanh Cong
391a7c381d Merge "Fix edge effect not showing up on first scroll" 
am: 894d8cf470

Change-Id: I6ab2b6a141f3cd52e9732d8c9965dc1c22c303f5
 2018-07-25 10:22:20 -07:00
Pete Gillin
c2b639218e Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." 
am: 8c8fb65ad3

Change-Id: I33e614584ec7b445b35872d0b84d5224c6f7c4af
 2018-07-25 10:15:02 -07:00
Treehugger Robot
894d8cf470 Merge "Fix edge effect not showing up on first scroll" 2018-07-25 16:43:11 +00:00
Olivier Gaillard
a657aeb185 Disable generating Binder#getTransactionName. 
It might have introduce a performance regression.

Bug: 111791983
Test: manual
Change-Id: I459d9e4e4d2d5d0be0531742a7910848702a1384
 2018-07-25 17:18:07 +01:00
Treehugger Robot
8c8fb65ad3 Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." 2018-07-25 16:02:48 +00:00
Mathew Inwood
7393f85a6e Merge "Update annotation name in class2greylist." 
am: 6c32f5d18e

Change-Id: I1a1f79a7a95814e37d337f1bb6bd10aa545cfaf9
 2018-07-25 04:54:37 -07:00
Pete Gillin
d6eece37ab Turn droiddoc's metalava_merge_annotations_dir into a list. 
This change replaces droiddoc's metalava_merge_annotations_dir
parameter (which takes a single value) with
metalava_merge_annotations_dirs (which takes a list). This will makes
it possible to merge libcore annotations in from a separate directory
under ojluni, instead of adding them in a preprocessing step.

Test: `make metalava-api-stubs-docs` with a local change to add a second directory
Bug: 111639530
Change-Id: I8eb778038c1cb52ddb6fc86d972f555f49e836b2
 2018-07-25 11:43:42 +01:00
Treehugger Robot
6c32f5d18e Merge "Update annotation name in class2greylist." 2018-07-25 10:42:12 +00:00
Mathew Inwood
738a23fbeb Update annotation name in class2greylist. 
Annotation was added with name @UnsupportedAppUsage after Android API
council discussion.

Bug: 110868826
Test: m class2greylist
Change-Id: I63ad61e97c5e8fdebfcead9e4ee5b060a60f97c7
 2018-07-25 09:45:04 +01:00
Remi NGUYEN VAN
93c22129e2 Merge "Increase TEST_LINGER_DELAY_MS" 
am: 9a783699cc

Change-Id: Iff68ee39ead571293877464c03ab98ab594dfcca
 2018-07-24 22:05:37 -07:00
youngmin0822.lee
e332fe4b3d Merge "don't call setSize() when creating SurfaceControl" 
am: 57e98b19be

Change-Id: Iec44550e5c18fa7d3005c8c79e607fc1bc656c13
 2018-07-24 22:01:41 -07:00
Remi NGUYEN VAN
0519a19f48 Merge "Remove test dependency on ubsan runtime" 
am: c77d25e441

Change-Id: Icce8b11f2a1c380c899ebaac52ac4b2c427492c9
 2018-07-24 21:57:42 -07:00
Remi NGUYEN VAN
9a783699cc Merge "Increase TEST_LINGER_DELAY_MS" 2018-07-25 03:08:48 +00:00
Treehugger Robot
57e98b19be Merge "don't call setSize() when creating SurfaceControl" 2018-07-25 02:31:13 +00:00
Remi NGUYEN VAN
c77d25e441 Merge "Remove test dependency on ubsan runtime" 2018-07-25 02:28:21 +00:00
Steven Moreland
90a9868802 Fix order of hidl unlinkToDeath. 
Calling unlinkToDeath after linking to death multiple
times will unregister the most recently registered
death recipient as expected.

Bug: 67503915
Test: hidl_test_java
Change-Id: Ia7774c3d1f8932660890716e0edb7a1180430de7
 2018-07-24 13:11:53 -07:00
Paul Duffin
9cb60599e4 Merge changes from topic "deprecate-iis-closed" 
am: bba51fede5

Change-Id: Ib9a9603093cd224fd1abe4b6c87cbaf1141eabc4
 2018-07-24 12:14:57 -07:00
Martijn Coenen
1d336da880 resolve merge conflicts of 80894b606303eb9320a9969c1553d14ce0220dca to stage-aosp-master 
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7c36f66c4bf9129c1b421290f82bdae83be6979e
Merged-In: If9dd6913868a34ea1e3d14fee1860a4ff368e06b
 2018-07-24 20:04:57 +02:00
Mathew Inwood
b4b293b0ec Merge "Add annotation for hidden members used by apps." 
am: 78368234b2

Change-Id: I36473b64f55c96f1ea0b42080b8ff7c229180840
 2018-07-24 09:27:01 -07:00
Neil Fuller
3b3a29e316 Merge "Move UriCodec to be near its one user" 
am: 55d8b54ac3

Change-Id: I847df7436d4ef6d1bac9513e7b3579abecc6f87d
 2018-07-24 09:15:59 -07:00
Paul Duffin
bba51fede5 Merge changes from topic "deprecate-iis-closed" 
* changes:
  Deprecate InflaterInputStream.closed field
  Correct ordering of TelephonyManager methods
 2018-07-24 15:22:30 +00:00
Treehugger Robot
80894b6063 Merge "Make BinderProxy @hide public class." 2018-07-24 14:12:13 +00:00
Mathew Inwood
78368234b2 Merge "Add annotation for hidden members used by apps." 2018-07-24 14:00:23 +00:00
Treehugger Robot
55d8b54ac3 Merge "Move UriCodec to be near its one user" 2018-07-24 13:58:39 +00:00
Mathew Inwood
2e61590a4c Add annotation for hidden members used by apps. 
This annotation will be added to existing hidden methods and fields that are
known to be used by apps.

These annotations will be used to replace the existing hard coded greylist
text files.

See go/hidden-api-annotations for more context.

Test: m
Bug: 110868826

Change-Id: I1b86ad8460525c2896fb84d7f1f95a521f582b9c
 2018-07-24 13:05:37 +01:00
Android Build Merger (Role)
557a4a7a16 Merge "Merge "Break some dependencies on libcore internals" am: f672c2bcb8" into stage-aosp-master 2018-07-24 09:37:46 +00:00
Neil Fuller
768eb8082e Merge "Break some dependencies on libcore internals" 
am: f672c2bcb8

Change-Id: Idac0ae9e4271aa09f8c7481de0509b69f3862141
 2018-07-24 02:37:12 -07:00
Neil Fuller
8d59399398 Merge "Break some dependencies on libcore internals" 
am: f672c2bcb8

Change-Id: I234d938606b07a5116c39dfcc378d55bcd521c2d
 2018-07-24 02:33:02 -07:00
Paul Duffin
6565aae0e9 Merge "Remove dependency on InflaterInputStream.closed field." 
am: 555fc87b99

Change-Id: I66687ef9b82fb2071e6fc04726d099bc1b5fab65
 2018-07-24 02:27:35 -07:00
Neil Fuller
f672c2bcb8 Merge "Break some dependencies on libcore internals" 2018-07-24 08:50:50 +00:00
Paul Duffin
555fc87b99 Merge "Remove dependency on InflaterInputStream.closed field." 2018-07-24 08:14:31 +00:00
Remi NGUYEN VAN
f6b73b2349 Remove test dependency on ubsan runtime 
Requirement for this dependency was removed in aosp/696863.

Bug: b/79785496
Test: runtest frameworks-net (aosp), atest FrameworksNetTests
Change-Id: I14bb65c8f0a9b55aeae6376ff04ce18be7dc7f22
 2018-07-24 11:28:29 +09:00
Nathan Harold
232487ff44 Merge "Access Identity and SignalStrength from CellInfo" 
am: c99ced9db8

Change-Id: Ibec751dc256381a504d0366725f6d43b624f27ab
 2018-07-23 15:53:55 -07:00
Nathan Harold
c99ced9db8 Merge "Access Identity and SignalStrength from CellInfo" 2018-07-23 21:35:00 +00:00
Jeff Vander Stoep
df01c2cf19 [automerger skipped] Merge "Check for /dev/memcg/system/tasks before writing to it" 
am: 36ce625ccf  -s ours

Change-Id: I8112055d639675f0a2fd61e91e04793d480ad880
 2018-07-23 13:39:03 -07:00
Treehugger Robot
36ce625ccf Merge "Check for /dev/memcg/system/tasks before writing to it" 2018-07-23 19:21:19 +00:00
Gopal Krishna Shukla
c38e0f19c1 Merge "Avoid onServiceDisconnected() for unbind Service" 
am: a37c252248

Change-Id: I825afa6ce1a341f37687fb453a1eeda1ad19ae86
 2018-07-23 12:10:57 -07:00
Neil Fuller
0f6f3bd7f0 Move UriCodec to be near its one user 
The only user of UriCodec is android.net.Uri so it can
be moved to android.net.

This change moves the UriCodecTest to the unit tests
and there is an associated change to Uri's CTS tests
to ensure we're testing public method behavior there too.

Test: make droid && make cts
Bug: 111055375
Change-Id: Id032f849b439adf3fd7cb1a3c8b234a5eec68fac
 2018-07-23 19:53:11 +01:00
Brad Ebinger
a36d57b722 Merge "Quick style fixup of ISmsImplBase" 
am: 6a5c1492d2

Change-Id: Idf5c1cbcc4d7ef22a99289bf8aebeedfb301e53a
 2018-07-23 10:59:25 -07:00
Treehugger Robot
a37c252248 Merge "Avoid onServiceDisconnected() for unbind Service" 2018-07-23 17:27:13 +00:00
Mathew Inwood
812291cc46 Merge "Add new "class2greylist" tool." 
am: 7f0aa734a3

Change-Id: I7d53d60ea3537530a9e21e2de2f53eb764f7d0b5
 2018-07-23 10:08:47 -07:00
Mathew Inwood
1b04588ea6 Merge generated greylists into final greylist. 
With annotations for greylist entries, each java target generates it own
greylist.txt file. Merge all of these into the final greylist.txt.

Bug: 110868826
Test: m
Change-Id: I6a64c65000f1fd9f49e09b5b498bdccc3560d606
 2018-07-23 18:06:58 +01:00
Brad Ebinger
6a5c1492d2 Merge "Quick style fixup of ISmsImplBase" 2018-07-23 16:41:51 +00:00
Mathew Inwood
7f0aa734a3 Merge "Add new "class2greylist" tool." 2018-07-23 15:51:06 +00:00