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

308810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Gaillard
434968aa2f Add stroke width property used by animated vector drawables 
This is for example used in displaying a checked radio button.

Test: Modified widget render test to include a checked radio button
Change-Id: I43074ce038f69f28c0cf5fb396d393722b02b142
 2017-02-27 14:44:46 +00:00
Seigo Nonaka
194f375979 Merge "Follow Minikin's signature changes." 2017-02-27 04:30:31 +00:00
Tyler Gunn
a955c9df90 Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be am: 2f96f34373 
am: 9b59cc7bad

Change-Id: Idee131069636fc8a4ea086a3d41bce4c1dfcbda6
 2017-02-27 03:10:57 +00:00
Tyler Gunn
6680508946 Merge "Format Japanese numbers using national format when in Japan." am: 050e5ddb4f am: 8ac499fbe6 
am: a84292c9d7

Change-Id: I770af0bba538268797295f59c8675191a6ef41a6
 2017-02-27 03:05:28 +00:00
Tyler Gunn
9b59cc7bad Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be 
am: 2f96f34373

Change-Id: Ia14b054be24acc2a767707b72a12902460cd11e7
 2017-02-27 03:05:21 +00:00
Tyler Gunn
2f96f34373 Merge "Fix videoStateToString for audio/paused state." 
am: 89e7a888be

Change-Id: I04fe4d5b61c548f3b5f012af343c4e08334933e0
 2017-02-27 03:01:08 +00:00
Tyler Gunn
a84292c9d7 Merge "Format Japanese numbers using national format when in Japan." am: 050e5ddb4f 
am: 8ac499fbe6

Change-Id: Ied615fbaf689a931a2b93785d944f2a8bd7f49dd
 2017-02-27 02:59:21 +00:00
Tyler Gunn
89e7a888be Merge "Fix videoStateToString for audio/paused state." 2017-02-27 02:55:25 +00:00
Tyler Gunn
8ac499fbe6 Merge "Format Japanese numbers using national format when in Japan." 
am: 050e5ddb4f

Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
 2017-02-27 02:54:49 +00:00
Tyler Gunn
050e5ddb4f Merge "Format Japanese numbers using national format when in Japan." 2017-02-27 02:48:11 +00:00
Seigo Nonaka
c7064146f9 Follow Minikin's signature changes. 
Minikin now uses shared_ptr instead of MinikinRefCounted.

Bug: 28119474
Test: manually tested
Test: hwui_unit_tests passed.
Change-Id: Ie0564851a8a798af112679e15f7a07db000a977e
 2017-02-27 11:15:19 +09:00
Jeff Sharkey
4190575960 Merge "Delete @removed APIs that never shipped." 2017-02-27 01:45:44 +00:00
Andy Hung
adcab8234a Merge changes I21b77905,Ia98ec539 
* changes:
  VolumeShaper: Use VolumeAutomation interface and unhide
  VolumeShaper: Remove PlayerProxy constructor
 2017-02-26 07:04:41 +00:00
TreeHugger Robot
d627294d83 Merge "Catch all exceptions thrown by the interfaces." 2017-02-26 04:39:13 +00:00
Jack Yu
1399ad76fb resolve merge conflicts of e091985bb5b5 to stage-aosp-master am: 82c46d11f6 
am: 9080d6708d  -s ours

Change-Id: I112682c76b21e0cc646026e6ec2f3b883023427c
 2017-02-25 06:16:51 +00:00
Jack Yu
9080d6708d resolve merge conflicts of e091985bb5b5 to stage-aosp-master 
am: 82c46d11f6

Change-Id: I2b6b5f698d03c86957fdaf4f73e26dfe36758924
 2017-02-25 04:58:12 +00:00
TreeHugger Robot
68b41c9a1b Merge "Strip out some logics from ESP to FSP that DSP can use." 2017-02-25 04:17:33 +00:00
TreeHugger Robot
313fd5f345 Merge "Do not set tooltips on items in list-based menus." 2017-02-25 03:41:17 +00:00
Andy Hung
fef734cec1 VolumeShaper: Use VolumeAutomation interface and unhide 
Test: Ducking and CTS
Bug: 31015569
Change-Id: I21b77905e86bf336c05aad5378f33ff36a92b3b5
 2017-02-24 19:12:50 -08:00
Andy Hung
7da0e98219 VolumeShaper: Remove PlayerProxy constructor 
Use of the VolumeShaper through PlayerProxy requires system ids,
which is different enough from PlayerBase that we don't allow
direct construction.

Test: Ducking
Bug: 31015569
Change-Id: Ia98ec5396047ae39e78237bb7e485d07f2eb1efd
 2017-02-24 19:12:35 -08:00
TreeHugger Robot
d77ae2b0ac Merge "Implement reset to original selection." 2017-02-25 02:57:55 +00:00
Jack Yu
82c46d11f6 resolve merge conflicts of e091985bb5b5 to stage-aosp-master 
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
 2017-02-24 18:47:01 -08:00
TreeHugger Robot
bcf55c19ed Merge "Add CIECAT02 chromatic adaptation transform" 2017-02-25 02:45:55 +00:00
TreeHugger Robot
7548ad9ed0 Merge "Process the NetworkInfo before updating AccessPoints." 2017-02-25 02:31:47 +00:00
Garfield Tan
75379db42d Strip out some logics from ESP to FSP that DSP can use. 
Also notify MediaStore when move happens.

Test: build & smoke tested.
Change-Id: I01576765c0b25089a81b77ce0904abea8b24d485
 2017-02-24 18:30:03 -08:00
TreeHugger Robot
3b57462a86 Merge "Refactored savableIds() into a SaveInfo class." 2017-02-25 01:45:00 +00:00
Chen Xu
b44860f994 Merge "move ACTION_CARRIER_SETUP intent to public api" am: fcb37ffc60 am: f4854018a2 
am: 9897cc4369  -s ours

Change-Id: Ie96a60472c7d7f0fb8e70e535745d849bfc3f68c
 2017-02-25 01:24:27 +00:00
TreeHugger Robot
38323b0280 Merge "Add logging constants for setting build number preference." 2017-02-25 01:19:18 +00:00
Chen Xu
9897cc4369 Merge "move ACTION_CARRIER_SETUP intent to public api" am: fcb37ffc60 
am: f4854018a2

Change-Id: Ie9ff472da7912042ec969268dd46d1b9a404526c
 2017-02-25 01:17:31 +00:00
Makoto Onuki
e9cedbd281 Merge "Don't include Bitmaps in activity intents" 2017-02-25 01:15:35 +00:00
Treehugger Robot
e091985bb5 Merge "Added a settings for CMAS message broadcast" 2017-02-25 01:13:29 +00:00
Chen Xu
f4854018a2 Merge "move ACTION_CARRIER_SETUP intent to public api" 
am: fcb37ffc60

Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e
 2017-02-25 01:12:09 +00:00
Chen Xu
fcb37ffc60 Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-25 01:05:30 +00:00
Amith Yamasani
99ccebf548 Merge "Reduce screen on delay during UsageStats rollover" 2017-02-25 00:59:02 +00:00
Sundeep Ghuman
2b48990b9c Process the NetworkInfo before updating AccessPoints. 
This fixes a UI issue where the Tracker first displays the connected
accessPoint as inactive before processing the connected state, which
causes the list to jump around.

Also add useful debugging information to AccessPoint toString.

Bug: 35681450
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I9a8356cfdd2e5be2da58ce5de82e228fddf301f9
 2017-02-24 16:57:53 -08:00
TreeHugger Robot
eef52f7322 Merge "Fix VR current component changes being ignored." 2017-02-25 00:56:01 +00:00
TreeHugger Robot
4351d95225 Merge changes Ib32aca72,I201f081e 
* changes:
  Bind to the recommendation service specified in the Setting.
  Move NetworkScorerAppManager into com.android.server.
 2017-02-25 00:41:11 +00:00
Conrad Chen
be339625a8 Merge "Add TvProvider methods to get and add columns" 2017-02-25 00:18:04 +00:00
Jack Yu
a585180c75 Merge "Added a settings for CMAS message broadcast" 2017-02-25 00:11:12 +00:00
Makoto Onuki
8abba3a641 Don't include Bitmaps in activity intents 
Bug: 35515740
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests

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 CtsShortcutManagerTestCases
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 CtsShortcutHostTestCases

Change-Id: Ibb94728eb03997bb850b08c61c756f283bd90a08
 2017-02-24 15:37:38 -08:00
Jason Monk
af57b3dfb0 Merge "Add colorError" 2017-02-24 23:29:29 +00:00
Zak Cohen
90a8a80a76 Fix VR current component changes being ignored. 
Bug: 35723429
Test: built, run on device and verified that controller works
Change-Id: I7467f893ef313145d7aa555285dae60cb7ec3cf2
 2017-02-24 15:24:24 -08:00
TreeHugger Robot
3471880ab0 Merge "Improve service docs around user unlocking." 2017-02-24 23:17:44 +00:00
Soonil Nagarkar
3dd51ad2e4 Merge "Throttle GNSS measurements and GNSS navigation messages in background (completely)." 2017-02-24 22:56:49 +00:00
Amith Yamasani
61d5fd7fee Reduce screen on delay during UsageStats rollover 
Decoupled the app idle book-keeping from usage stats lock, by
introducing an mAppIdleLock. This is used for all state related
to app idle. In some cases, the locks will be nested, with
mLock being acquired first and then mAppIdleLock.

This should fix the situation where a rollover, which writes to
disk and could take several seconds when the system is swamped,
like when the device just came out of idle and the screen was
turned on (like this run-on sentence), causes calls from other
services for app-idle status to be blocked. This was resulting
in a long time to turn on the screen.

Also fixed a dump indentation issue.

Bug: 34627115
Bug: 34961340
Test: Manual, force into idle, increased rollover frequency,
      and tested screen on time.

Change-Id: Ie8b44e6f07f82d8a31f1b733a403dd9b6dc310f6
 2017-02-24 14:54:36 -08:00
TreeHugger Robot
ab78912972 Merge "Send ranking update on channel update." 2017-02-24 22:42:07 +00:00
Fan Zhang
b66e542567 Add logging constants for setting build number preference. 
Change-Id: I79ab6c89ec67e464167a96cf4350d8628bacbd91
Fix: 34774945
Test: Builds
 2017-02-24 14:37:45 -08:00
TreeHugger Robot
a608207fc3 Merge "gnss HAL uses "default" service name" 2017-02-24 22:21:53 +00:00
Chris Thornton
d7f52c1b76 Merge "SoundTriggerTestApp: Provide onClick callbacks for audio capture." 2017-02-24 21:56:38 +00:00
Netta Peterbursky
bf07da5650 Merge "Protobufferize PowerManager dumpsys" 2017-02-24 21:36:19 +00:00