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

316317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
101dc265a8 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 2017-04-14 18:21:46 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
 2017-04-14 18:19:22 +00:00
Chad Brubaker
65cf224a3a Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev am: 8ee12087e6 
am: 4ad2d2b4d0

Change-Id: I784ba8d936046e65bcec1612ba77ff8aaba26975
 2017-04-14 18:18:33 +00:00
Hugo Benichi
61bfec0cbd Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762 am: e505b37ec5 
am: 9b7453f3c6

Change-Id: I04d6b51bef76c8937227c038c5825ed486812b71
 2017-04-14 18:17:31 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822 
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
 2017-04-14 18:13:50 +00:00
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
 2017-04-14 18:13:49 +00:00
Roozbeh Pournader
3f01530a68 Support overriding display locale for SuggestedLocaleAdapter 
The method now accepts a locale for overriding the labels
"Suggested", "All regions", etc.

Fixes: 31257462
Test: Manual
Change-Id: I6e8c95d8d3e7b05a284b171f2cf2819d32e53d8d
 2017-04-14 11:13:27 -07:00
Tsukasa Hashimoto
5d57502c89 Merge "Add PID info into ANR crash log header" 
am: 2fe972c822

Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
 2017-04-14 18:09:56 +00:00
Seigo Nonaka
24c6464663 Merge "Use provided style for fallback font selection" into oc-dev am: 43112fd26e 
am: 83c52e0a40

Change-Id: Ia42f6a377c2617c8da9a84cb8bd7781326e464a1
 2017-04-14 18:09:55 +00:00
Hugo Benichi
752fa520d7 Merge "Captive portal: rotate fallback urls" into oc-dev am: a622b24d3a -s ours 
am: af18992066  -s ours

Change-Id: I86641338b2551a9b0136704dcfeed6327c639407
 2017-04-14 18:07:43 +00:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Jorim Jaggi
b4c52d616c Merge "Implement new splash screen API" into oc-dev am: 46ae660bf2 
am: 27af670d9a  -s ours

Change-Id: I4f772359bf0dab72caa298597da2a995db463979
 2017-04-14 18:05:30 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede 
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
 2017-04-14 18:01:24 +00:00
Svet Ganov
4df23412c6 Add back an id used by CTS am: 3de36a3cc1 
am: 1ded7a1ab1

Change-Id: I68ef269ecd75d3ffffc62b0ca0dd357221353d47
 2017-04-14 17:58:47 +00:00
Casey Burkhardt
2f44ae57f3 Merge "Icon assets for magnification" into oc-dev am: 4d386d5ce7 
am: 549a439b53

Change-Id: I9cc4e50292a04becf92548ab5be4c54d19736a54
 2017-04-14 17:57:42 +00:00
Jakub Pawlowski
f38cee4921 Bluetooth 5 PHY simplification am: a51513747a 
am: ed6ce8637b

Change-Id: I336f047a649f5ff89c35ce5f69a0916b27ed0df5
 2017-04-14 17:56:35 +00:00
Hugo Benichi
f24e74942b Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 am: 4479901ff3 
am: 43cdbc943d

Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950
 2017-04-14 17:55:26 +00:00
Jorim Jaggi
7f86cd606d Merge "Make sure theme attributes don't get lost" into oc-dev am: 9d2f03ec5d 
am: 5cf511907d

Change-Id: If65a78ae543335a9f3689e92665cca00e1fd5efd
 2017-04-14 17:54:07 +00:00
Winson Chung
ebb2bbba57 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev am: 2e86be7653 
am: 3a32d35723

Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34
 2017-04-14 17:53:03 +00:00
Romain Guy
870163ce34 Merge "Fix javadoc typos" into oc-dev am: 4b6e82d237 
am: 299ae2f422

Change-Id: Ifac19d190660a0ce129034794abe20bc5d9066dc
 2017-04-14 17:51:58 +00:00
Andrii Kulian
7ce72dac6d Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am: c66b6ff997 
am: aa412973d9

Change-Id: I2e6394ce9c7bc72f5aa4de90e294defeb2dbf222
 2017-04-14 17:46:46 +00:00
Wale Ogunwale
7654775b8a Merge "Move stack to front in-sync with task reparenting" into oc-dev 
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
 2017-04-14 17:41:52 +00:00
Jesse Evans
632e4afb1a Merge "Fix instant app filtering in ApplicationsState" into oc-dev am: 9bdaa9c9fa 
am: 783026710d

Change-Id: Id5a474354f69264a6959e8334f014860f6c98c8e
 2017-04-14 17:41:47 +00:00
Svet Ganov
651a974dd1 Fix NPE in autofill 
am: 833c68e9fd

Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
 2017-04-14 17:40:40 +00:00
Winson Chung
e0c9bc1582 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am: 4191d99614 
am: 7031cdda50

Change-Id: I6eb6069005460d372288d79b8a2387518842e73f
 2017-04-14 17:40:39 +00:00
Svet Ganov
19feef5229 Merge "Allow custom buttons in autofill UI" into oc-dev am: 249c4d709a 
am: 489cef380a

Change-Id: I846ea7cbd275323cf65ed57d37a0acf13b010085
 2017-04-14 17:38:13 +00:00
Dmitry Dementyev
25b5fa9d79 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 
am: 0bf753d2e5

Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
 2017-04-14 17:33:46 +00:00
Wale Ogunwale
c4555784be Merge "Move stack to front in-sync with task reparenting" into oc-dev 2017-04-14 17:33:03 +00:00
Hugo Benichi
0872123ede Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am: 0e8090b10e" into oc-dev-plus-aosp 
am: 562e577b1c  -s ours

Change-Id: I87c54fe259d38b87c84485793aa5820b55650583
 2017-04-14 17:32:27 +00:00
Jeff Sharkey
413a63ef78 Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am: f5d5e5e4bf" into oc-dev-plus-aosp 
am: 224b710a4f

Change-Id: Icdfe9487b2aa1d7d9245aaa87ccde048845b899d
 2017-04-14 17:31:12 +00:00
Romain Guy
65d8ce4676 Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am: 4cae059bb9" into oc-dev-plus-aosp 
am: e9277ebe4a

Change-Id: I187ec4ffcb2db909443e3c7286e1cdde7bc9193b
 2017-04-14 17:29:55 +00:00
Svet Ganov
833c68e9fd Fix NPE in autofill 
Test: manual

bug:37330744

Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
 2017-04-14 17:29:51 +00:00
Christopher Tate
b72714ee23 Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am: 59047acea7" into oc-dev-plus-aosp 
am: c1c3855397

Change-Id: I6c2c43156183ac5389d4ce1b1df94b517540e384
 2017-04-14 17:26:00 +00:00
Mady Mellor
b9b4a78562 Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am: 59c124b755" into oc-dev-plus-aosp 
am: 900f022984

Change-Id: I937d985fe18e1e0ebc9e5d1a92c154223d95d6b0
 2017-04-14 17:24:22 +00:00
Svet Ganov
3b436b15b7 Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp 
am: 37933ae25b

Change-Id: I264ce0527b8d4b4cc751487a9c14eda35cf733fe
 2017-04-14 17:23:00 +00:00
Rebecca Silberstein
e9cf2eb6ac Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613 am: 2f7a169618 
am: 01d3ad5cf2

Change-Id: Ifa2af8e64e0fa7e9d3033aef303872c3de5dd617
 2017-04-14 17:21:25 +00:00
Daniel Nishi
33f74edaa4 Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
 2017-04-14 17:18:40 +00:00
Andreas Huber
b263e71deb Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev am: 9b2ed2b7c4 
am: 71a840befa  -s ours

Change-Id: I6c8cfc324a62040b7df5e3f2f8c4dccfcbf09b4e
 2017-04-14 17:18:07 +00:00
Romain Guy
95648b8a59 Add BitmapFactory.Options.inColorSpace 
This allows applications to load bitmap in a preferred
target color space, similar to inPreferredConfig for
configurations.

This change also applies recent changes made to BitmapFactory
to BitmapRegionDecoder: support for outColorSpace, inColorSpace
and outConfig.

Bug: 32984164, 36905374
Test: CtsGraphicsTestCase (BitmapColorSpaceTest/BitmapRegionDecoderTest)
Change-Id: I4eded9190d1aa9c7f3033f9bb78a6854cc48a3ef
 2017-04-14 10:14:27 -07:00
Roozbeh Pournader
d92030d352 Merge "Add Adlam font to fonts.xml" into oc-dev am: 1ad7ff32b1 
am: b9e8d31eca

Change-Id: Icd43178709b25d325a16ea9644aa5ea08bc1d2f6
 2017-04-14 17:14:03 +00:00
Dongwon Kang
294176e988 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 
am: 0cdc7c8874

Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
 2017-04-14 17:13:49 +00:00
Daniel Nishi
864d53d6fc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 2017-04-14 17:11:30 +00:00
Julia Reynolds
4401196798 Synchronize access to ranking helper records. 
Fixes: 36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.

Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
 2017-04-14 17:06:03 +00:00
Dongwon Kang
0cdc7c8874 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 2017-04-14 17:05:31 +00:00
Yifan Hong
1ac3406335 Merge "Add Java API for libvintf." into oc-dev am: c223d70e64 
am: 38bf613c0f

Change-Id: I3d2d7c3db36395aa3fcfcbb2396619c46c353d05
 2017-04-14 17:05:01 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
 2017-04-14 17:04:19 +00:00
Ta-wei Yen
27a931eb69 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am: ad989b1711 
am: 63668e4396

Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f
 2017-04-14 17:03:34 +00:00
Lorenzo Colitti
405fd19da1 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp 
am: d6af00f5e4  -s ours

Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87
 2017-04-14 17:02:27 +00:00
Jorim Jaggi
b595d2a08c Merge "Don't consider app as top app if alpha = 0" into oc-dev am: 4a2be133d4 
am: 054a99d029

Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
 2017-04-14 17:01:19 +00:00