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

296382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
longhai
d7e2ae5fc7 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72 
am: 5c152a3d7f

Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
 2016-11-16 03:18:08 +00:00
longhai
5c152a3d7f Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 
am: 2be54fde72

Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
 2016-11-16 03:11:09 +00:00
longhai
2be54fde72 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
 2016-11-16 03:04:38 +00:00
Treehugger Robot
1813ae0159 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 2016-11-16 02:54:26 +00:00
sergeyv
554ffeb8b7 Support hardware bitmaps in bitmap shaders 
Test: hwuimacro bitmapShaderEglImage --onscreen.
bug:30999911
Change-Id: I9d16a1c217a4474841794cf27ce49e3f7823678e
 2016-11-15 18:43:09 -08:00
Seigo Nonaka
9669487d00 Merge "Move test only initialization to each test setup." 2016-11-16 02:17:57 +00:00
Daichi Hirono
976e63bdd3 Use StartFuseBridgeLoop function instead of FuseBridgeLoop class. 
The method is being renamed from FuseBridgeLoop::Start to StartFuseBridgeLoop
in libappfuse. The CL handles the change in the framework side.

Bug: 29970149
Test: None
Change-Id: I70b91e426fa817d84c7f1f5f24c9e3ba401e523b
 2016-11-16 10:12:37 +09:00
Jeff Sharkey
13deeafe46 Treat everyone the same, redux. 
Test: builds
Bug: 29746499
Change-Id: Id2a9aacf0db40cdd053d203897e792662c6d3cd0
 2016-11-16 01:12:13 +00:00
Jeff Sharkey
a3a43b09fe Fix copypasta error. 
Test: builds
Bug: 29087651
Change-Id: I99813278bc37fa332730144f821b33ae6bd35650
 2016-11-15 17:54:23 -07:00
Android Build Merger (Role)
3bda498b3f Merge "Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 am: 2e73b06f63 am: 0fc7044d0b" 2016-11-16 00:45:35 +00:00
Peter Qiu
1556340f9a Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 am: 2e73b06f63 
am: 0fc7044d0b

Change-Id: Ie42a4361d51ee489edc1357063516509cacddc0f
 2016-11-16 00:44:34 +00:00
Android Build Merger (Role)
06d202d3dd Merge changes from topic 'am-a57c7c884e184332ab6ba25437abb1a5' 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b am: 03e4bc1ead
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3 am: 996986254f
 2016-11-16 00:44:06 +00:00
Peter Qiu
c6d760ba1e wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b 
am: 03e4bc1ead

Change-Id: Ia56fb25083513ff82cda7f66f5617d02b81e96ec
 2016-11-16 00:42:16 +00:00
Peter Qiu
35d842ef22 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3 
am: 996986254f

Change-Id: I647413dfcfd9dc769c484a4fa7e7eae13c66e0a0
 2016-11-16 00:41:13 +00:00
Jorim Jaggi
3c9006d842 Merge "Fix that window was not hidden after policy hiding animation" 2016-11-16 00:40:53 +00:00
Svetoslav Ganov
63ff0d822b Merge "Temporary enable Build#SERIAL" 2016-11-16 00:33:16 +00:00
Peter Qiu
0fc7044d0b Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 
am: 2e73b06f63

Change-Id: I0be82ec64a61f015a34ded70202c422e43825778
 2016-11-16 00:29:39 +00:00
Svet Ganov
b5e603f270 Temporary enable Build#SERIAL 
Filed STOPSHIP b/32918547

bug:31803186

Change-Id: I66b26e5948d19391513e007daad099f51cb64155
 2016-11-15 16:29:38 -08:00
Peter Qiu
03e4bc1ead wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 
am: 134706940b

Change-Id: If04a8f9005b69b9f4f38c2e0ea38b7bc6162397e
 2016-11-16 00:27:34 +00:00
Peter Qiu
996986254f wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d 
am: 31b8e658d3

Change-Id: Ifce7abfb578e5b7d0a3d5c964926537e16ef3a2b
 2016-11-16 00:26:28 +00:00
Peter Qiu
2e73b06f63 Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf 
am: afb8f37711

Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
 2016-11-16 00:18:36 +00:00
Peter Qiu
134706940b wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 
am: 1b39c61ce7

Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
 2016-11-16 00:16:30 +00:00
Peter Qiu
31b8e658d3 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 
am: a9a9a9bb8d

Change-Id: I5be1220539e5a22e4f0d4e3d52ac85c608ccb950
 2016-11-16 00:14:46 +00:00
Peter Qiu
afb8f37711 Merge changes from topic 'HS2 API Cleanup' 
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
 2016-11-16 00:04:44 +00:00
Yifan Hong
ddf31f604e Fix include after spliting HidlSupport.h 
Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
 2016-11-15 16:02:40 -08:00
Peter Qiu
1b39c61ce7 wifi: remove unused hidden Hotspot 2.0 Release 1 API 
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
 2016-11-16 00:00:06 +00:00
Peter Qiu
a9a9a9bb8d wifi: remove hidden unused Hotspot 2.0 Release 2 APIs 
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
 2016-11-15 23:59:20 +00:00
Treehugger Robot
41fd0f1faf Merge changes from topic 'HS2 API Cleanup' 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
 2016-11-15 23:50:18 +00:00
Sudheer Shanka
bae5ca1490 Merge "Rename MountService to StorageManagerService." 2016-11-15 23:34:15 +00:00
Jerry Zhang
935372bfd6 Refactored setCurrentFunction and setUsbDataUnlocked into single method. 
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5ba8914933a54b5bfac25e118db0e9f)
 2016-11-15 15:29:45 -08:00
Jerry Zhang
dfacad026d Clean up persistent usb state on boot. 
b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
(cherry-picked from commit a45dac0e83f4f907b6b42f453181a7d5c01f65f3)
 2016-11-15 15:29:36 -08:00
Jerry Zhang
0269ebe0fe Fixed handling of usb state during adb changes. 
When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.

Also the mtp function should never be persisted.

Bug: 31818377
Bug: 31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit 58018d01a3c384b954275d15bee7f9c52a1c7c0a)
 2016-11-15 15:29:22 -08:00
Scott Main
b18745616f Add cross-links between FINE and COARSE location permissions. 
bug: 25371600

Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
 2016-11-15 15:26:38 -08:00
Bill Yi
8ec130dcfd Import translations. DO NOT MERGE 
Change-Id: I434734cca2145f095b82b1978997f03225fcacc9
Auto-generated-cl: translation import
 2016-11-15 15:17:47 -08:00
George Mount
f0b46b9540 Use safe access to OnPreDrawListener. 
Bug 32472451

It is important to remove an OnPreDrawListener from the correct
ViewTreeObserver. When a View is added to the view hierarchy, the
initial ViewTreeObserver is not active. The listener must then be
removed from the current OnPreDrawListener. When a View has been
removed from the hierarchy, it is important to remove the listener
from the orignal ViewTreeObserver.

Test: cts-tradefed run singleCommand cts -d --skip-preconditions
--skip-connectivity-check -m CtsUsageStatsTestCases
Test: cts-tradefed run singleCommand cts -d --skip-preconditions
--skip-connectivity-check -m CtsFragmentTestCases

Change-Id: I735f71d2d9c84e86ef846aab0088a8651300fbe8
 2016-11-15 15:00:53 -08:00
Jorim Jaggi
af221d16de Fix that window was not hidden after policy hiding animation 
When we removed WindowState.isOnScreenIgnoringKeyguard we forgot
to change WindowState.isOnScreen to also check policy visibility.

Test: runtest frameworks-services -c com.android.server.wm.WindowStateTests
Test: Open camera app, make sure status bar is hidden

Change-Id: I780f50c8ed3e675f2fab623fdba4fcfc5b6f1d5b
Fixes: 32890266
 2016-11-15 14:59:57 -08:00
Bill Yi
d79d2b11cb Import translations. DO NOT MERGE 
Change-Id: I2e2f67c23e29e036470bbf69834d8cf15bb18a81
Auto-generated-cl: translation import
 2016-11-15 14:15:25 -08:00
Jeff Sharkey
b501ef1e21 Aggressively clear cached data when forgetting. 
Otherwise the system server risks keeping open FDs to an adopted
storage device that could later be ejected.

Test: builds
Bug: 31596654
Change-Id: I6285042b4f0714dbf601c7dfa53efb704ea29d0b
 2016-11-15 14:39:19 -07:00
Selim Gurun
f8a440a89e Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev am: 83fbb94e18 
am: ffa68753f8

Change-Id: If6e62fb5ce4de5037fb4e537cd537776d7ae5a01
 2016-11-15 21:19:44 +00:00
Hui Shu
fa910482ce Fix WebViewDatabase javadoc. am: 68d2cc180f 
am: 1eb8a07e1b  -s ours

Change-Id: Ib40d91c858f4333984e697f1b1e551d8dc9dc5d6
 2016-11-15 21:18:10 +00:00
TreeHugger Robot
c67b49af3f Merge "Javadoc and un@hide ContentResolver#refresh and ContentProvider#refresh." 2016-11-15 21:11:07 +00:00
Jason Monk
630c5879d6 Merge "Protect against crash in fragment startup race" 2016-11-15 21:04:21 +00:00
Sudheer Shanka
2250d56a0b Rename MountService to StorageManagerService. 
Bug: 30977067
Test: Existing tests pass
Change-Id: Ieac0f11c2b249dcd60441b14c1f391e6f8131d42
 2016-11-15 12:43:37 -08:00
Jason Monk
7a95288453 Protect against crash in fragment startup race 
Because fragments can be hard.

Change-Id: I1eec2caf3729beaac2d36a97ba7cff422e546f44
Fixes: 32881893
Test: Look at device, verify no sysui crash dialog
 2016-11-15 15:41:46 -05:00
TreeHugger Robot
252a44e867 Merge "Null check file.list() results." 2016-11-15 20:28:33 +00:00
Selim Gurun
ffa68753f8 Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev 
am: 83fbb94e18

Change-Id: I6b7b1e04b00835ad2fde2d6d6b4b0dd6f3f81425
 2016-11-15 20:15:24 +00:00
Hui Shu
1eb8a07e1b Fix WebViewDatabase javadoc. 
am: 68d2cc180f

Change-Id: I811966bc364697f5c172cd9b4153d963962d8db2
 2016-11-15 20:15:17 +00:00
Selim Gurun
83fbb94e18 Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev 2016-11-15 19:57:42 +00:00
Fyodor Kupolov
3bfef01864 Merge "Control privileged permissions for priv-apps" 2016-11-15 19:29:14 +00:00
Felipe Leme
326336d14c Fixed obsolete comment. 
Bug:32906084
Test: not needed
Change-Id: I0c79e4ffb66405a30d3c83d2e7654cbef413f6e1
 2016-11-15 11:24:42 -08:00