1565 Commits

Author SHA1 Message Date
Christopher Tate
0d3c637e8a am 67691d13: Merge "Fix build" into lmp-preview-dev
* commit '67691d130e89135cc8de4cbe03d82058d9ee45b4':
  Fix build
2014-06-11 17:02:35 +00:00
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
2014-06-11 17:02:18 +00:00
Christopher Tate
b7b70f0f99 Fix build
Change-Id: I339f7f1ab82af699ee34c3baf824d0278477a4cf
2014-06-10 15:20:49 -07:00
Jinsuk Kim
7207b792d9 Merge "Define SendKeyAction for HdmiControlService" 2014-06-10 22:31:57 +00:00
Jinsuk Kim
cd97baf4d0 Define SendKeyAction for HdmiControlService
SendKeyAction is one of FeatureAction classes that handles HDMI-CEC UCP/UCP
(User Control Pressed/Release) command transmission flow mechanism.

Change-Id: Iede8479103330c1f9db516218c6a94d09ef6b7f4
2014-06-11 14:30:32 +09:00
Jungshik Jang
5945d484ca Merge "Use cached message in NewDeviceAction." 2014-06-10 22:31:57 +00:00
Jungshik Jang
a466929979 Use cached message in NewDeviceAction.
Vendor id and osd name can be cached in be reused
later.
Along with this, fix a bug on HotplugDetectionAction.

Change-Id: I0583a9c266eed4281a99a59b1301f41b3e155505
2014-06-11 13:59:59 +09:00
Jungshik Jang
65c64c31ab Implements Hdmi Cec keycode translater
In order to transfer some keyevent to other device
we need to have a logic to translate Android keycode
to Hdmi CEC keycode and vice versa.
HdmiCecKeyTranslater handles bidirectional keycode translation.
Basically it assumes bijection between android key code to
a pair of cec keycode and its optional param.
KeycodeEntry of HdmiCecKeycodeTranslate handles a mapping of it.

Note that all available mappings have no parameterized mapping.
If new Android keycode is defined for parameterized cec keycode,
entry should be added.

Change-Id: I287082a0a6ef5eb6f0916044b78179fe3fdfbece
2014-06-11 10:14:39 +09:00
Yohei Yukawa
04fcf1cabe Merge "Show IME-related system IME dialogs over windows owned by the IME" 2014-06-10 22:29:12 +00:00
Lorenzo Colitti
7dc78cf3af Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
2014-06-10 14:46:39 -07:00
Sreeram Ramachandran
cc91c7b804 Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
Christopher Tate
7060b04f6d Out with the old; in with the new
Switch to the official "JobScheduler" etc naming.

Bug 14997851

Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
2014-06-10 12:51:55 -07:00
destradaa
54f6e80d32 Merge "IPv6 support for GPS HAL." 2014-06-10 19:42:04 +00:00
Amit Mahajan
965bba3434 Merge "resolved conflicts for merge of 437a77d4 to master" 2014-06-10 18:38:26 +00:00
destradaa
96a14701c0 IPv6 support for GPS HAL.
Change-Id: Iacaf3ab86009975ba07e1a13dbe539cf47c5a6f7
2014-06-10 11:14:31 -07:00
Amit Mahajan
0409e9f0af resolved conflicts for merge of 437a77d4 to master
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
2014-06-10 10:47:26 -07:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
2014-06-10 17:21:52 +00:00
Christopher Tate
4a1c0bd20b am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev
* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
  Switch framework to using new scheduled-work API
2014-06-10 17:21:47 +00:00
Yohei Yukawa
1ee99c4627 Show IME-related system IME dialogs over windows owned by the IME
The IME-related system dialogs should be placed over any window
owned by the current IME. However, the framework has taken only
the main window of the current IME has been taken into account.
As a result, the system has not been able to show its IME-related
dialog properly layer when the IME is showing its own dialog.

This CL addresses the above issue.

BUG: 5809660
Change-Id: I205321c7ed42516f36a4bf29dd6a159ac34fd5ec
2014-06-11 00:50:29 +09:00
Matthew Williams
f53c295ae3 am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.
2014-06-10 14:55:46 +00:00
Adam Connors
8f70744221 DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Bug: 14400206
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
(cherry picked from commit c11c67b3e117b4fec3245f87b6d510461c1f8323)
2014-06-10 11:39:31 +00:00
Matthew Williams
3f51a909f0 am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev
* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
  Add test app for JobScheduler
2014-06-10 11:17:55 +00:00
Adam Connors
ac383e52a9 DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-10 10:24:14 +00:00
Kenny Guy
ef2b37ea87 Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only." 2014-06-10 08:55:47 +00:00
Jungshik Jang
2ae1019c97 Merge "Implement cec message cache." 2014-06-10 04:40:40 +00:00
Jungshik Jang
e81e108c40 Implement cec message cache.
HDMI bus for CEC is quite slow and it may cause conflict
or timeout during device discovery stage or hot-plug
detection stage. However, some static information, such
as physical address, vendor id or osd name are usually
sent automatically when a device is connected, and
almost never change after updated.

Change-Id: I4df9d27ef1af04ee35d63a764580fed07c32d15d
2014-06-10 13:39:19 +09:00
Craig Mautner
df8e542a8a Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 2014-06-10 01:29:43 +00:00
Craig Mautner
e1ab884a67 Merge "resolved conflicts for merge of 1e6706ab to master" 2014-06-10 01:27:07 +00:00
Craig Mautner
f357c0ca51 Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
2014-06-09 18:09:33 -07:00
Amith Yamasani
b27528d066 Make LocationManagerService aware of user profiles
LocationManagerService normally doesn't provide location to background users.
With managed profiles, there are more than one foreground users and they both
need to get location when in the foreground. So LMS will now compare the caller
against all foreground users and provide location if valid.

Bug: 14671472
Change-Id: If3baabfc5a3ab3f2f081d7fc28f35d840d5f1489
2014-06-09 18:06:20 -07:00
Christopher Tate
115afdadb5 Switch framework to using new scheduled-work API
Also add the intended permission-use enforcement to said API.

Bug 14994893
Bug 14993295

Change-Id: I5a3ffd32d0702c68f4ef6da68f7fa6e9de674380
2014-06-09 17:49:50 -07:00
Matthew Williams
effacfa75b Add OnNetworkActive to TaskManager and simplify locking.
Bug: 14993295
Hooks up a ConnectivityManager.NetworkActiveListener.
    
Previously was using 3 locks where 1 would suffice,
negligible to no performance issues b/c most of the previous locks
were nested.

Added OnNetworkActiveListener so that the ConnectivityController can kick of
tasks when it knows that the network is active.

Fixed some bugs that stopped timecontroller from executing tasks.

Requesting a retry will not add a deadline to that task. However backed-off
tasks are run as soon as they are ready, subject to their constraints.

Added receiver to listen for package removal and user removal, which will
delete any outstanding jobs for that uid.

Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
2014-06-09 17:18:11 -07:00
Michael Kolb
7119c07192 resolved conflicts for merge of 1e6706ab to master
Change-Id: Ia8e8fdf5e13acca496bf7ff9916c9950d5b13e4e
2014-06-09 15:35:59 -07:00
Amit Mahajan
437a77d4bb am 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.
* commit '3f175a3587f5f7c7d6189c0fd09468bae4e81325':
  Handle provisioning APN by turning off/on radio.
2014-06-09 21:12:43 +00:00
Michael Kolb
1e6706abb2 am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev
* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
  Remove circular mask
2014-06-09 21:12:19 +00:00
Matthew Williams
508a8a0ab4 Merge "Add test app for JobScheduler" into lmp-preview-dev 2014-06-09 20:23:10 +00:00
Amit Mahajan
3f175a3587 am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.
2014-06-09 19:50:09 +00:00
RoboErik
e252909394 am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
  Adds listeners for changes to the list of active sessions
2014-06-09 19:29:58 +00:00
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
2014-06-09 19:29:48 +00:00
RoboErik
5f670bd65c am 7d0b1256: Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev
* commit '7d0b1256e3a08a1b0a98f217eb9a0e9f5809f57e':
  b/15452153 Send 0 delta volume requests
2014-06-09 19:29:42 +00:00
RoboErik
a3d8188556 Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 2014-06-09 19:07:49 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
RoboErik
b6b31f2741 Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev 2014-06-09 19:07:10 +00:00
Ji-Hwan Lee
8d396392cc am 9a904962: Merge "Set mBound only when bind succeeds" into lmp-preview-dev
* commit '9a9049626d214a6329090abbba8e067ef3005c2e':
  Set mBound only when bind succeeds
2014-06-09 17:44:43 +00:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Adam Connors
d4b584ea7f Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-09 13:55:47 +01:00
Yohei Yukawa
0fcedfd8ea Merge "Introduce a sequence number to avoid redundant IPCs" 2014-06-09 12:02:30 +00:00
Yohei Yukawa
3d1e8129eb Introduce a sequence number to avoid redundant IPCs
This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
   IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
   sequence number. IMM should call #notifyUserAction only
   once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
   number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
2014-06-09 18:30:02 +09:00
Ji-Hwan Lee
e17b2dd7bc Set mBound only when bind succeeds
Fixes an issue that TV input is disabled forever after package upgrade,
when it's upgraded while in use.  The root cause is as below:

- Package is killed while upgrade.
- Service disconnects, and tries to rebind for reconnecting, but bind fails
  because service is not available temporarily.  Still ServiceState.mBound is
  set to true.
- Should rebind next when callback is registered or new session is created,
  but doesn't because ServiceState is already marked bound.

Bug: 14981201
Change-Id: Ia5b0acb33f1247064213024438f114bc40238648
2014-06-09 15:22:59 +09:00
Jinsuk Kim
f43cea0094 Merge "Remove HdmiCecService" into lmp-preview-dev 2014-06-09 01:13:29 +00:00