25337 Commits

Author SHA1 Message Date
Mike Lockwood
c130d4d46b Merge "MidiService: Fix some concurrency problems" 2015-03-24 19:37:04 +00:00
Wale Ogunwale
e7f931c450 Merge "Fixed build breakage caused by AOSP submission http://go/oag/c/143360" 2015-03-24 17:50:26 +00:00
Christopher Tate
00182096d8 Merge "Switch to new userActivity and package install APIs" 2015-03-24 17:43:59 +00:00
Wale Ogunwale
0ade61bc97 Fixed build breakage caused by AOSP submission http://go/oag/c/143360
Change-Id: I64288bd49e6713ab40b52735802210abc91348a7
2015-03-24 10:43:45 -07:00
Christopher Tate
2c7a0cc2cf Switch to new userActivity and package install APIs
Tracking the deprecation of older API variants and switching to the
new and more informative versions.  Also tidying up a few unused
variables along the way.

Change-Id: I282a18525f9db838f4e0a77c90403b8b904e4fd7
2015-03-24 10:41:52 -07:00
Svetoslav
9041df7f69 Remove obsolete comments
Change-Id: Ieabe9e8e86cfe226751a0402e4c7d55f2a18c8b1
2015-03-24 10:03:08 -07:00
Olawale Ogunwale
0dbc50acae am 04466d92: am bfd7a123: am f5f70b66: Merge "[ActivityManager] Avoid killing unrelated processes."
* commit '04466d92db4b4a511141d272db045864950b4d7d':
  [ActivityManager] Avoid killing unrelated processes.
2015-03-24 16:38:43 +00:00
Olawale Ogunwale
a2e8de7410 am 357d4ec8: am 3e305491: am 000293c9: Merge "Layout the window to be displayed if it would be resized"
* commit '357d4ec8b75dc53371c8eb39663720db6c63a6e9':
  Layout the window to be displayed if it would be resized
2015-03-24 16:38:35 +00:00
Olawale Ogunwale
a44c1bbf72 am 4f8783de: am fecfadb5: am 07520c94: Merge "DimLayer : remove unnecessary surface transaction calls"
* commit '4f8783de72633188e4a52ffdf79e5b8f91282974':
  DimLayer : remove unnecessary surface transaction calls
2015-03-24 16:38:28 +00:00
Olawale Ogunwale
bfd7a12334 am f5f70b66: Merge "[ActivityManager] Avoid killing unrelated processes."
* commit 'f5f70b66a3f22ca5e23a4d1e6061f2a36dfb4c92':
  [ActivityManager] Avoid killing unrelated processes.
2015-03-24 16:25:11 +00:00
Olawale Ogunwale
3e305491cc am 000293c9: Merge "Layout the window to be displayed if it would be resized"
* commit '000293c93b41f69857f228d085b6f44b9afa34b0':
  Layout the window to be displayed if it would be resized
2015-03-24 16:25:03 +00:00
Olawale Ogunwale
fecfadb508 am 07520c94: Merge "DimLayer : remove unnecessary surface transaction calls"
* commit '07520c944cfce3441621c6d08ca185d0efb3ea50':
  DimLayer : remove unnecessary surface transaction calls
2015-03-24 16:24:55 +00:00
Olawale Ogunwale
f5f70b66a3 Merge "[ActivityManager] Avoid killing unrelated processes." 2015-03-24 16:12:23 +00:00
Olawale Ogunwale
000293c93b Merge "Layout the window to be displayed if it would be resized" 2015-03-24 16:11:40 +00:00
Dohyun Lee
6ce3a37f6b DimLayer : remove unnecessary surface transaction calls
There is the case that adjustSurface()  get called even if
the size of the surface of DimLayer is not changed actually.
Since changing the size of a surface is processed synchronously
in the SurfacFlinger, there is usually a few milliseconds delay
(up to 1 vsync interval) when we launch an application.
This patch avoids such cases.

Change-Id: Ib1f76d54f9f2364ac54b70120e4b781e8534e750
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2015-03-24 13:31:22 +09:00
Qiwen Zhao
44f388a3ed Merge commit 'ff4bdd0b' 2015-03-23 20:18:22 -07:00
Jeff Sharkey
bafd48d027 Merge "Introduce per-user GIDs for storage." 2015-03-24 02:38:48 +00:00
Craig Mautner
6a1cbb106a Merge "Prevent unexpected rotation while going back to keyguard" 2015-03-24 02:24:59 +00:00
Jeff Sharkey
00f3904629 Introduce per-user GIDs for storage.
This will eventually allow us to have a single unified filesystem
instead of requiring zygote to use bind mounts.

Change-Id: I29b819ab51498b4bab874e0367b1ab4165f84025
2015-03-23 19:14:19 -07:00
Svet Ganov
95c1adea0c Add install option to grant all runtime permissions.
Change-Id: I72ba67a72025646a3d53611621b0353d3a86677c
2015-03-24 01:53:50 +00:00
Svetoslav
ca7256ef32 Merge "Runtime permissions: per user permission tracking." 2015-03-24 01:52:11 +00:00
Svetoslav
c6d1c345f4 Runtime permissions: per user permission tracking.
Before all permissions were granted at install time at once, so the user
was persented with an all or nothing choice. In the new runtime permissions
model all dangarous permissions (nomal are always granted and signature
one are granted if signatures match) are not granted at install time and
the app can request them as necessary at runtime.

Before, all granted permission to an app were identical for all users as
granting is performed at install time. However, the new runtime model
allows the same app running under two different users to have different
runtime permission grants. This change refactors the permissions book
keeping in the package manager to enable per user permission tracking.

The change also adds the app facing APIs for requesting runtime permissions.

Change-Id: Icbf2fc2ced15c42ca206c335996206bd1a4a4be5
2015-03-23 18:50:35 -07:00
Christopher Tate
c75517c160 Merge "Back up and restore the set of enabled IMEs" 2015-03-24 01:13:20 +00:00
Mike Lockwood
87f6fe1235 MidiService: Fix some concurrency problems
Change-Id: Icae3dee7ced4f1a326c0621da45908735e1febfa
2015-03-23 17:10:58 -07:00
Craig Mautner
93f724b04e Merge "Recalculate input method top edge." 2015-03-23 23:56:42 +00:00
tiger_huang
21637018f9 Prevent unexpected rotation while going back to keyguard
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.

https://code.google.com/p/android/issues/detail?id=155640

Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
2015-03-23 16:28:53 -07:00
Christopher Tate
7b9a28c7f0 Back up and restore the set of enabled IMEs
The restored set of enabled IMEs/subtypes is merged into the
current state of the system, rather than simply replacing it.
This is because we do not want to accidentally disable or
reconfigure something that the user is currently relying on.

There's a certain amount of repetitive activity here, rebuilding
the enabled-state data structures in a different format, but it's
important for maintainability that the restore code be able to
rely on the core InputMethodUtils implementation of reading/writing
the settings element.

Bug 19822542

Change-Id: If0104151b3526da6ecc669adde3119a239ecafeb
2015-03-23 16:28:21 -07:00
Craig Mautner
386b397b0b Merge "Add null check and call destroy from single point." 2015-03-23 22:12:17 +00:00
Craig Mautner
26d577b08f am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard"
* commit 'f8a2ba511ee2dc5360f323c71eff5e0f2465dd99':
  Prevent unexpected rotation while going back to keyguard
2015-03-23 22:03:14 +00:00
Craig Mautner
00a6675461 Add null check and call destroy from single point.
Ensure that calling destroy() on a DimLayer surface only happens
once.

Fixes bug 19660387.

Change-Id: Iee8ea20b5d7c3a8f81f14a3ecff66a1dc1a8d719
2015-03-23 14:00:47 -07:00
Jeff Brown
221a8277dc resolved conflicts for merge of 13d81b6d to master
Change-Id: Icb72123fcf4b74e97d9a62504caf8a17eb65c9e6
2015-03-23 13:53:09 -07:00
Anthony Hugh
09ebc52a85 am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
* commit '7c08dd61c43d76241c8f47c5aae934486605a80e':
  DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
2015-03-23 20:21:58 +00:00
Anthony Hugh
7c08dd61c4 Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev 2015-03-23 20:15:50 +00:00
Adam Lesinski
11cc1f166d DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
Some UI is displayed (boot/optimizing) before the configuration
has been completely set. This noteably happens for watches and
TVs because UIModeManagerService hasn't started yet.

UIModeManagerService is started earlier, and its dependency
TwilightService is loaded during the "all system services ready"
boot phase.

b/18388692

Change-Id: Iabdf8ac3eb04ebcb44779d752e19042769cc65c6
2015-03-23 12:02:52 -07:00
Craig Mautner
4774f6a4e4 Recalculate input method top edge.
The bottom edge of an input method target window is set using the top
edge of the input method window. A switch from using the input
method's content frame's top edge to its display frame's top edge
(ag/634725) caused the underlying window to be obscured. This fix uses
the lower of the two frames to set the bottom edge of the target
window.

Fixes bug 19434816.

Change-Id: I5fe73fbe8a432b24a12c030f029cdfcd55e23274
2015-03-23 11:49:03 -07:00
Adam Lesinski
3561761776 Merge "Set the appliance (tv/watch) in the configuration earlier" 2015-03-23 18:33:10 +00:00
tiger_huang
1263b2f1f2 Prevent unexpected rotation while going back to keyguard
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.

https://code.google.com/p/android/issues/detail?id=155640

Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
2015-03-23 05:58:46 +00:00
Jeff Sharkey
bf2673384c Merge "Bring MountService into the SystemService world." 2015-03-22 20:03:55 +00:00
Jeff Sharkey
56e629322f Bring MountService into the SystemService world.
Change-Id: I7f7db49ff373b199f7b81f184a7c62bee682af67
2015-03-21 20:41:00 -07:00
Jeff Brown
13d81b6dd2 am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
  Disable more hotkeys while in setup.
2015-03-20 22:35:41 +00:00
Jeff Brown
619ce1ce53 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
2015-03-20 22:10:54 +00:00
Jeff Brown
38d3feb76c Disable more hotkeys while in setup.
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
2015-03-20 13:26:09 -07:00
John Spurlock
606f1c9c9d Merge "HUN: Implement per-package config." 2015-03-20 20:20:09 +00:00
Rubin Xu
ec32b56cc2 Add DelegatedCertInstaller API in DPMS
Allow device/profile owner to delegate certificate APIs to third-party
certificate installer apps.

Bug: 19551274
Change-Id: Iaf9abb5ecb1dc0975fa98ea14408fe392d52fbf4
2015-03-20 10:11:29 +00:00
Lorenzo Colitti
f2104b11a8 Merge changes Iddc971c7,If907f49f,I5505bd2c,I110b5800,I9aeb29c2, ...
* changes:
  DHCP: Don't write options longer than 255 bytes.
  DHCP: parsing robustness fixes.
  DHCP: Add a hidden setting to use the legacy DHCP client.
  DHCP: Add a Java DHCP client.
  Add a protectFromVpn method that takes a FileDescriptor
  DHCP: protocol changes.
  DHCP: glue code.
  DHCP: Ethernet/IP packet header changes.
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.
  Add two utility methods for IPv4 netmasks.
2015-03-20 08:29:26 +00:00
Lorenzo Colitti
06ac4b8dd1 DHCP: Don't write options longer than 255 bytes.
Change-Id: Iddc971c7ac97253af3063850cde3dee10c3829ff
2015-03-20 16:32:44 +09:00
Lorenzo Colitti
b05c9234e6 DHCP: parsing robustness fixes.
1. Check the length of the fixed-length portions of the packet.
2. Catch BufferUnderflowException while parsing options.

Change-Id: If907f49f02a04a4a3360f46a3192e94ab099af0e
2015-03-20 16:32:43 +09:00
Lorenzo Colitti
e7d4243be9 DHCP: Add a Java DHCP client.
The behaviour of the client is intended to mirror the behaviour
of the current DhcpStateMachine + dhcpcd combination, except it
does not store leases across network changes.

Bug: 19704592
Change-Id: I110b58003da2d8293059d48a0181e16f7f7f145c
2015-03-20 16:32:41 +09:00
Lorenzo Colitti
fe5ffce09c DHCP: protocol changes.
1. Define and add parsing code for MTU, max message size, T1, T2.
2. Add common TLVs (message size, hostname, vendor ID) to all
   packets sent by the client.
3. Don't include requested IP and server ID in renew messages,
   since the RFC says MUST NOT.
4. Don't hardcode the broadcast flag to true in DISCOVER packets,
   use what the caller passed in.
5. Make some methods static.

Bug: 19704592
Change-Id: I42a0997e468b12e19cad9b403b98fe266e6cea73
2015-03-20 16:32:39 +09:00
Lorenzo Colitti
86bff86778 DHCP: glue code.
1. Add a method to make a DhcpResults object from a DHCP packet.
2. Add a method to fetch the client MAC from the packet. This is
   needed to check that the message is for us (lots of DHCP
   messages are broadcast).
3. Add a length argument to the method that parses DHCP packets,
   so the caller can use the same MTU-sized array all the time
   instead of having to pass in a new array for every packet.

Bug: 19704592
Change-Id: I58223f5ec90fb5c762bc2934649e02f9122018b2
2015-03-20 16:32:39 +09:00