Commit Graph

236525 Commits

Author SHA1 Message Date
Tyler Gunn
ad716ebb73 Merge "Add connection properties to Connections." into nyc-dev 2016-03-25 03:44:44 +00:00
Paul Stewart
0a835f6e43 Merge "WifiConfiguration: Remove dead commented code" into nyc-dev 2016-03-25 03:42:10 +00:00
Daichi Hirono
44e2a69585 Merge "Implement FUSE_WRITE command in app fuse." into nyc-dev 2016-03-25 03:29:52 +00:00
Tyler Gunn
720c664401 Add connection properties to Connections.
- Per suggestion of API council, moving properties of a Connection from
CAPABILITIES_* to PROPERTIES_*.

Bug: 27458894
Change-Id: Icce921b03cda514a991646ed39a26559c7e91230
2016-03-24 20:20:11 -07:00
Jiabin Huang
2dc6cc9aa4 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev 2016-03-25 02:26:04 +00:00
Daichi Hirono
09ece6c68b Implement FUSE_WRITE command in app fuse.
The CL adds a handler for FUSE_WRITE command which invokes a Java
handler.

BUG=23093747

Change-Id: I1903fca6b5663e6241ad540a89fe812310ba6810
(cherry picked from commit 35693da25a)
2016-03-25 11:18:44 +09:00
Dianne Hackborn
966f1c9348 Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev 2016-03-25 01:50:33 +00:00
Sergei Vasilinetc
4ce5653555 Merge "Clean up setLayerType and setLayerPaint" into nyc-dev 2016-03-25 01:42:50 +00:00
Svetoslav Ganov
d61a57fdd0 Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev 2016-03-25 01:33:38 +00:00
Ruben Brunk
41f02e5d50 Merge "Allow current VrListenerService to read thermal info." into nyc-dev 2016-03-25 01:08:18 +00:00
Andriy Naborskyy
669cacac70 Merge "resolve merge conflicts of 0c7535b to nyc-dev" into nyc-dev 2016-03-25 01:06:48 +00:00
Svetoslav Ganov
b2c2e452e5 Guard against a NPE when using ParceledSliceList
bug:27558595

Change-Id: Idaa3b37d1d3bbb10b93e08ef1976758fde0b0ce3
2016-03-24 18:01:22 -07:00
Dianne Hackborn
9cfba35020 Fix issue #25817435: Batterystats missing UIDs for secondary users
Change-Id: I9ad907571f04b5825d234758347659544a4de6ab
2016-03-24 17:31:28 -07:00
Jungshik Shin
fe952f3a0b Merge "Add Lang-to-Script entries for languages with new hyph patterns" into nyc-dev 2016-03-25 00:30:45 +00:00
Andriy Naborskyy
815e51d76c resolve merge conflicts of 0c7535b to nyc-dev
Change-Id: I49fa42e0d78aeaa8127cefc5cc5122cf37fce878
2016-03-24 17:14:52 -07:00
Joe Onorato
a8a644e5f6 Merge "Turn off verbose logs and remove log that is covered by verbose logs." into nyc-dev 2016-03-24 23:21:47 +00:00
Joe Onorato
7b7c0a4e45 Merge "Fix crash in writing battery stats to health stats" into nyc-dev 2016-03-24 23:07:21 +00:00
sergeyv
342a7e6a7c Clean up setLayerType and setLayerPaint
bug:21755299
Change-Id: I8f0953ccfc3d743abdecc8ec228ed3e1b6718c3c
2016-03-24 16:06:46 -07:00
Jorim Jaggi
6a7c90a12b Implement clip modes during animation
Introduce modes how surfaces are clipped to the stack bounds
during transitions.

Use setFinalCrop to implement STACK_CLIP_AFTER_ANIM.

Add logic to determine which stack clip mode to use.

Bug: 26559810
Change-Id: I8edc47de3aaf1ef12055cefd8ceb8df536c5109a
2016-03-24 22:56:07 +00:00
Andriy Naborskyy
0c7535bb4f Merge "bootanimation: implement split packaging of animation" into cw-e-dev
am: 9f68357

* commit '9f68357d5f71c263f2ff67736a0d2272cc840c32':
  bootanimation: implement split packaging of animation
2016-03-24 22:43:04 +00:00
Ruben Brunk
3876fbcfa8 Merge "Fix crash in ManagedApplicationService." into nyc-dev 2016-03-24 22:29:03 +00:00
Joe LaPenna
50551006b8 Merge "Reduce idle, idle_after_inactive timeouts to 15m" into nyc-dev 2016-03-24 22:21:39 +00:00
Felipe Leme
3e39f50a3d Merge "Proper handle of duplicated BUGREPORT_STARTED." into nyc-dev 2016-03-24 22:14:43 +00:00
Felipe Leme
657c2fa5c6 Merge "Removed obsolete @NonNull." into nyc-dev 2016-03-24 22:14:38 +00:00
Andriy Naborskyy
9f68357d5f Merge "bootanimation: implement split packaging of animation" into cw-e-dev 2016-03-24 22:03:21 +00:00
Paul Stewart
e8ea325716 WifiConfiguration: Remove dead commented code
Nobody uses this code.  Let's clean up.

Bug: 27054653
Change-Id: I7b3dccd09de270de6fd5a17da3217495dbce421a
2016-03-24 14:56:28 -07:00
Joe LaPenna
0c5d3e95c7 Reduce idle, idle_after_inactive timeouts to 15m
BUG: 25678232
BUG: 25678232

Change-Id: Ie39f1e2ac245b50826a01b3286ded0c67736b6fa
2016-03-24 13:44:53 -07:00
Tony Mak
0effee8849 Merge "Use FLAG_ACTIVITY_TASK_ON_HOME to make sure back button brings user to home" into nyc-dev 2016-03-24 20:40:02 +00:00
Tony Mak
4291c76e80 Use FLAG_ACTIVITY_TASK_ON_HOME to make sure back button brings user to home
In work challenge, we want to show home when user taps back button.
Previously, we do this by launching launcher before showing work challenge.
We now use FLAG_ACTIVITY_TASK_ON_HOME instead.

Bug: 27826548
Change-Id: I74cca611bf00c6f53b4752f2967a0c729ddf2d61
2016-03-24 20:39:36 +00:00
Sharvil Nanavati
32dd848436 Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev 2016-03-24 20:17:45 +00:00
Alex Klyubin
e60d72f49a Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev 2016-03-24 19:46:44 +00:00
Chris Craik
d7285c29d1 Merge "Add refBitmap tests" into nyc-dev 2016-03-24 19:44:15 +00:00
Winson Chung
533daacef7 Merge "Disabling affiliated tasks." into nyc-dev 2016-03-24 19:10:48 +00:00
Rob Carr
157fea650b Merge "Do not adjust child windows placement for fit to display." into nyc-dev 2016-03-24 19:08:41 +00:00
Robert Carr
3d93897a56 Do not adjust child windows placement for fit to display.
Consider the case where we have made a child windows parent
and task smaller in the docked stack but the client has not
yet caught up and requested a new size for the child window.
In this case it is possible for the child windows requested
layout to extend beyond the bounds of the available display area
(in this case the containing frame). Our intended behavior is
to clip this extra area, while preserving the relative offset
of the child and parent window. If we apply gravity to fit within
the display frame, the behavior will instead be to modify
this offset in order to reduce the amount of cropped window.
While this is a sensible idea for laying out fullscreen tasks, it
is not helpful for windows layed out in the parent frame.

Bug: 27687126
Bug: 27676101
Bug: 27601572
Change-Id: I80607a29506dc5a127ac0eab12c2aeb9450e13f6
2016-03-24 19:07:56 +00:00
Deepanshu Gupta
90b6454cb3 Merge "Support getResource*Name() methods for Resources" into nyc-dev 2016-03-24 19:04:21 +00:00
Alex Klyubin
9b59bc459b Ignore signature stripping protection for preinstalled APKs.
The current build process may currently strip APK Signature Scheme v2
signatures from prebuilt APKs to be installed on the system or vendor
partitions. However, it leaves intact the signature scheme rollback
protections introduced by APK Signature Scheme v2. Due to a bug, when
the system extracts signer certificates from preinstalled APKs, it
encounters the rollback protection and aborts the extraction process.
This manifests itself as some preinstalled packages not appearing as
installed.

This change makes the system ignore signature scheme rollback
protections when extracting certificates from preinstalled APKs. This
is fine because the process of extracting certificates from
preinstalled APKs does not care about validity/integrity of signatures
and the APKs. It only cares about extracting signer certificates.

Bug: 27829513
Change-Id: I3bed463e776b057e93a0fce915db4014946be1f9
2016-03-24 12:02:20 -07:00
Deepanshu Gupta
618ca261f3 Support getResource*Name() methods for Resources
The following methods are now supported:
getResourceEntryName
getResourcePackageName
getResourceTypeName
getResourceName

Bug: http://b.android.com/181872
Change-Id: If06b5e0687ab6f8cb20ab77f339870dd08a84ce1
2016-03-24 12:02:17 -07:00
Alan Viverette
4a2f9857c2 Merge "Ensure correct width and height are used during popup positioning" into nyc-dev 2016-03-24 18:33:57 +00:00
Robin Lee
363e70dd00 Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev 2016-03-24 18:32:52 +00:00
Joe Onorato
13460a6cba Turn off verbose logs and remove log that is covered by verbose logs.
Bug: 27744135
Change-Id: I436cfd325f87b3b9205d50e92e2a70a50dd33344
2016-03-24 11:32:17 -07:00
Joe Onorato
a2f003bc3c Fix crash in writing battery stats to health stats
Bug: 23147564
Change-Id: Icfa34b637deedc60b839ba73f875c0008c68695b
2016-03-24 11:32:17 -07:00
Joe LaPenna
23c63dd65f Merge "Allow setting doze timeouts based on system feature" into nyc-dev 2016-03-24 18:18:26 +00:00
Chris Craik
734f146c1e Add refBitmap tests
Change-Id: I769457ff8934689bf425bab34a65d2a743959f9d
2016-03-24 11:10:10 -07:00
Alan Viverette
f50df4362a Ensure correct width and height are used during popup positioning
Passes the width and height into findDropDownPosition() rather than
relying on global state. Ensures that an update is forced if any
aspects of the LayoutParams are changed during drop down position
computetion. Cleans up method and argument naming.

Bug: 27819843
Change-Id: Id85e2a0e81e0ea6a754dadf7c1d1c2493a5979b0
2016-03-24 14:08:24 -04:00
Yohei Yukawa
cdf90bb674 Merge changes I16312592,Iadfc226e into nyc-dev
* changes:
  Revert "Remove redundant IMM#mServedInputConnection."
  Revert "Make sure to call back reportFinish() on the desired Handler."
2016-03-24 17:54:21 +00:00
Samuel Tan
a70cbf7f9c Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev 2016-03-24 17:46:22 +00:00
Abhijith Shastry
d1ceef09a7 Merge "Add an unblock API to BlockedNumberContract." into nyc-dev 2016-03-24 17:33:58 +00:00
Jeremy Joslin
52f0ea56db Merge "Add meteredHint to WifiConfiguration." into nyc-dev 2016-03-24 17:27:54 +00:00
Yohei Yukawa
223db8b6f5 Revert "Remove redundant IMM#mServedInputConnection."
This reverts commit afb6558c8f.

It turns out that this CL caused a serious regression Bug 27824691.

Bug: 25332806
Bug: 27824691
Change-Id: I16312592743a6673449c492ee5ba533256d343ea
2016-03-24 10:26:19 -07:00