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

316277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jesse Hall
793f0a3963 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am: 8cafe5d9b4 
am: e20f42b8a9

Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
 2017-04-14 17:00:13 +00:00
Julia Reynolds
ad1e9c9825 Remove @removed method 
Change-Id: I0b92edcc0440674003694ace9b53cad6124948dc
Fixes: 37340967
Test: make
 2017-04-14 12:59:47 -04:00
Julia Reynolds
00314d97e9 Lock access to managed services. 
Fixes: 35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.

Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
 2017-04-14 12:59:47 -04:00
Adam Lesinski
82dad75c1f Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am: b97d51a0d2 
am: 48d5b68815

Change-Id: Ic6422832379d008311c7727f99090251d73bba6b
 2017-04-14 16:59:07 +00:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Todd Kennedy
801e65905b expose the instant app installer component 
Bug: 35873804
Test: TreeHugger
Change-Id: I4d962927587bb10833bfe3c3db27fdceab668fc3
 2017-04-14 09:49:13 -07:00
Dianne Hackborn
52a29573ee Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542 
am: 9596d71664

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
 2017-04-14 16:48:32 +00:00
Makoto Onuki
d7e405851f Fix the wrong IMPORTANCE_ values. 
Bug: 36697597
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t android.app.cts.AlertWindowsTests

Change-Id: I3327d4668470400e8b30faeebb77534eeb2583ed
 2017-04-14 09:47:54 -07:00
Daniel Nishi
58e291f1a5 Merge "Don't crash in background after app uninstall." into oc-dev am: 74037d1287 
am: f110127aef

Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05
 2017-04-14 16:47:12 +00:00
Jeff Tinker
835a765a3a Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd51 
am: a29ecc1a1c

Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
 2017-04-14 16:46:07 +00:00
Wale Ogunwale
2719cc134e Move stack to front in-sync with task reparenting 
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.

Test: manual
Bug: 37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
 2017-04-14 09:45:27 -07:00
jiabin
cc6759b193 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am: 2ec7decaa5 
am: 4f499a0a17

Change-Id: I0622c0f58c5ba2560b5c17c52a613cadcdb24ecc
 2017-04-14 16:36:01 +00:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev 
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
 2017-04-14 16:33:14 +00:00
Romain Guy
b7c30edeb1 Merge "Range check transfer params in float domain" into oc-dev am: 819740cc73 
am: 1f1667122a

Change-Id: I5240515f1dd5939227f90b8b2aaf59622af6bea7
 2017-04-14 16:33:12 +00:00
Peng Xu
3242ee7920 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am: 5ebb159a92 
am: 70004dd19c

Change-Id: I68cbdfa94e98abde8fa0b072605051f3e0ed561d
 2017-04-14 16:28:04 +00:00
Matt Sarett
ca9b703b88 Bug fix: use legacy SkCanvas regardless of color space tag 
Test: Added unit test. CtsGraphicsModule.

Bug: 32984164

Change-Id: If72e1e31c98e01f97f3a05d763f5d4c71cf88313
 2017-04-14 16:26:50 +00:00
TreeHugger Robot
b7f0db8d89 Merge "Update more implementations of findViewById()" into oc-dev 2017-04-14 16:26:27 +00:00
Makoto Onuki
c40f2ab76e Merge "Actually remove the chooser APIs" into oc-dev am: fbadd6dac9 
am: efda6390c9

Change-Id: I0a43d717f62dddace49e63ff2ab80283dea12357
 2017-04-14 16:25:50 +00:00
Evan Rosky
3efa8c8fed Merge "Improve rect-level focus ordering" into oc-dev am: 197052d6cb 
am: d6072f2900

Change-Id: Ide53aafb83aa1ca71adb966472ad5a411197e3f3
 2017-04-14 16:23:44 +00:00
Adam Lesinski
c645e732b9 Merge "AAPT2: Fix order-of-destruction crash" into oc-dev am: 62b713ed73 
am: 2fc8adc5fc

Change-Id: Ic723218e00e8eea1305bb47083bc056816c6f1a3
 2017-04-14 16:20:55 +00:00
Selim Cinek
58c5d5abca Merge changes Icc9c36f7,I723474e2 into oc-dev am: 07525d4f25 
am: f1f29ca50b

Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3
 2017-04-14 16:19:57 +00:00
Lei Yu
f69156ff95 Merge "Refine BatteryInfo and battery drawable" into oc-dev am: 57af565fb7 
am: 24638307c2

Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
 2017-04-14 16:18:02 +00:00
Jean-Michel Trivi
dc36701751 Merge "Fix A11y volume persisting/restore" into oc-dev am: 076a0bd0bf 
am: 350b39fbc8

Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
 2017-04-14 16:16:46 +00:00
Chad Brubaker
4ad2d2b4d0 Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev 
am: 8ee12087e6

Change-Id: I3f02d7e1b8dfba220fca62cea406650ed7851570
 2017-04-14 16:14:24 +00:00
Dongwon Kang
08b24d1507 Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d 
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
 2017-04-14 16:12:49 +00:00
Bookatz
c2c9363c7a Merge "Collect background stats: syncs" into oc-dev am: a8fc7bff5a 
am: 53b7ff2014

Change-Id: I30744a569a8617369e52c06de9b897128521cbb4
 2017-04-14 16:11:50 +00:00
Jeremy Joslin
ce66b0d019 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev am: 5879aa4b03 
am: 9bcbf38e79

Change-Id: I6f57d8b0cc62b9ebe690e6d2efc5c725e90c8fe7
 2017-04-14 16:10:34 +00:00
Adam Lesinski
08551954aa Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev am: 4124851b64 
am: b8dc42fcf3

Change-Id: I4874c6683a150b98f8edcd4f1d5e60e69b39e457
 2017-04-14 16:09:37 +00:00
Jason Monk
e30503f485 Merge "Fix location status bar icon" into oc-dev am: d2b368a68d 
am: 2e55245f98

Change-Id: I2dabf81060d98a2dcbec6487900c7148fc4daa07
 2017-04-14 16:08:42 +00:00
Adam Lesinski
c7c66e7f78 Merge "Update docs for obtainStyledAttribute" into oc-dev am: 80b7a214ba 
am: f8235c3631

Change-Id: I7235021ff618fd99f5f1470cbf6e7e64420788e2
 2017-04-14 16:07:45 +00:00
Chad Brubaker
8ee12087e6 Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev 2017-04-14 16:07:15 +00:00
Bryce Lee
5aa7e073bc Merge "Remove window container from empty task when destroying." into oc-dev am: 61bce9ab13 
am: a27128b8c7

Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
 2017-04-14 16:06:48 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050 
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
 2017-04-14 16:04:32 +00:00
Jim Van Verth
99effcccbc Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev am: 1be9766a68 
am: c7fd8db8a6

Change-Id: If7f3bfc01496a9fe9b198dc63bd7c064943c9008
 2017-04-14 16:03:13 +00:00
Dianne Hackborn
cc04f02b44 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3 
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
 2017-04-14 16:01:58 +00:00
Jason Monk
108b8ec82a Merge "Fix leak in nav bar" into oc-dev am: 0b67d53ba9 
am: cea904333e

Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
 2017-04-14 16:01:02 +00:00