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

23471 Commits

Author SHA1 Message Date
Craig Mautner
2322ea558e am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 
automerge: afc6d33

* commit 'afc6d332790166943302f051d32ec0874d9280aa':
  Add reason string for bringing stack to front
 2015-01-26 20:11:58 +00:00
Craig Mautner
afc6d33279 am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 
* commit '8995e140ad557c9f3f4667becbaaf0ba4c667638':
  Add reason string for bringing stack to front
 2015-01-26 20:09:48 +00:00
Craig Mautner
8995e140ad Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 2015-01-26 20:05:45 +00:00
Craig Mautner
299f960e5e Add reason string for bringing stack to front 
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.

For bug 17721767.

Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
 2015-01-26 10:57:11 -08:00
Benjamin Franz
ad66480838 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
automerge: 2805669

* commit '2805669954b70b918d7b24f6695c4da85d6f88e8':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:59:45 +00:00
Benjamin Franz
2805669954 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:55:14 +00:00
Zoltan Szatmary-Ban
20bd0c232c am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '059b8ab6a9444b1dbdfcdc1df50485dfac7adafa':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:49:53 +00:00
Benjamin Franz
6d16b8614a Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 2015-01-26 10:49:48 +00:00
Zoltan Szatmary-Ban
059b8ab6a9 am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '414ea81ea364d7b961cbfb885c30729595e3a7b2':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:41:00 +00:00
Zoltan Szatmary-Ban
414ea81ea3 Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 2015-01-26 10:36:14 +00:00
Lorenzo Colitti
351bfad339 Make NetworkMonitor less aggressive on broken networks. 
1. Retry validation 3 times instead of 10.

Reducing the number of retries speeds up dead network detection
and saves battery on networks that are don't have Internet access
(or block our connectivity checks).

Retrying 10 times is overkill. Each attempt sends 5-10 DNS
requests, waits 10 seconds to transfer only 3 or 4 packets, and
can last up to tens of seconds. Also, in MR1 we now retry every
10 minutes.

2. Make periodic revalidation only try once.

When validating periodically to see if a non-working connection
is working again, only make one attempt every 10 minutes, not
three.

3. Rename "retries" to "attempts" to make things a bit clearer.

Bug: 18922569
Bug: 18869302
Change-Id: I5f70b420c4f1bac0c33bb9ab6afb322902cdac4b
 2015-01-26 17:30:22 +09:00
Lorenzo Colitti
df59053588 Only try to fetch time from NTP if there is a network connection. 
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
 2015-01-26 15:24:07 +09:00
Svetoslav
cd2ed4e64c Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e 
automerge: db1983b

* commit 'db1983b3f43e86acbf188961f53af794cce05219':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:31:38 +00:00
Svetoslav
db1983b3f4 Accessibility: Sometimes cannot interact with nav bar items. 
automerge: 10a053e

* commit '10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:27:34 +00:00
Svetoslav
10a053e474 Accessibility: Sometimes cannot interact with nav bar items. 
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.

bug:18889611

Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
 2015-01-23 15:05:20 -08:00
Jinsuk Kim
f612132003 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
automerge: ca1384d

* commit 'ca1384dc5abb2d29906310fd577c5ed6fba25f24':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:20:46 +00:00
Jinsuk Kim
ca1384dc5a am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
* commit '56c119abde951146951e3887796eb64ee05d25d3':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:16:48 +00:00
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00:00
Benjamin Franz
f87b174dac Avoid NullPointerException if createUser returns null 
If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.

Bug: 19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
 2015-01-23 17:04:16 +00:00
Benjamin Franz
07b87e537d am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:42:38 +00:00
Benjamin Franz
bfca5f40eb am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:37:42 +00:00
Benjamin Franz
266303fdb0 Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 2015-01-23 14:33:06 +00:00
Zoltan Szatmary-Ban
871fa7343a Ensure notifications are sent when locking/unlocking location share 
When the restriction 'DISALLOW_SHARE_LOCATION' is applied or removed on a user
it is important to send out notifications to content observers of
LOCATION_PROVIDERS_ALLOWED.

Bug: 18995405
Change-Id: I8b3910a423a012ea9d15470eec101723c9f0eaf7
 2015-01-23 14:08:30 +00:00
Jinsuk Kim
c4228a7281 CEC: Handles initiation of press-and-hold correctly 
Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.

Bug: 19117830

Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81
 2015-01-23 18:20:20 +09:00
Jinsuk Kim
55055d690e am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
automerge: 9ae7d49

* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
  CEC: Add logic to return to internal source
 2015-01-23 07:00:40 +00:00
Jinsuk Kim
9ae7d4975c am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
  CEC: Add logic to return to internal source
 2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Craig Mautner
b978450b1c Merge "Even more debug for bug 17721767." into lmp-mr1-dev automerge: dbabf37 
automerge: 5cb31f2

* commit '5cb31f2179c70152f94bcb8309449fc2e7bed63a':
  Even more debug for bug 17721767.
 2015-01-22 23:37:51 +00:00
Craig Mautner
5cb31f2179 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 
automerge: dbabf37

* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.
 2015-01-22 23:24:11 +00:00
Craig Mautner
dbabf37fd3 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 2015-01-22 23:17:47 +00:00
Craig Mautner
de313753d0 Even more debug for bug 17721767. 
This time adding events for stack movement and focus change.

Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
 2015-01-22 14:28:03 -08:00
Benjamin Franz
fadb2b3a27 Avoid SecurityException when calling getUserData 
Currently we risk getting a SecurityException in a number of places,
where getUserData is called for a different user than the calling user.
To avoid this, the caller is cleared in a helper function.

Bug: 18662452
Change-Id: Ibc131c602e52d9f013fe739a9c18e693181ded67
 2015-01-22 16:16:16 +00:00
Narayan Kamath
1194e754a9 Merge "Add support for persist.sys.locale." automerge: dca2332 
automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
  Add support for persist.sys.locale.
 2015-01-22 13:56:01 +00:00
Narayan Kamath
d30dbb8ae1 Add support for persist.sys.locale. 
AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.

The system_server has been changed to write out persist.sys.locale
on locale changes.

bug: 17691569

Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
 2015-01-22 13:48:20 +00:00
Jinsuk Kim
cb8661c08f CEC: Add logic to return to internal source 
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
 2015-01-22 16:58:26 +09:00
Erik Kline
61b07b4016 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b 
automerge: 4f36150

* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:18:00 +00:00
Erik Kline
4f3615036d Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 
automerge: 147cf4b

* commit '147cf4b8c4345f2d086251313583888356317d2d':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:10:58 +00:00
Erik Kline
147cf4b8c4 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Jinsuk Kim
8175e7b364 am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev automerge: 7de1ed9 
* commit 'c988e15e1ff8e85981e7cd3347d759b37be1cf2f':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:27:26 +00:00
Jinsuk Kim
c988e15e1f Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 
automerge: 7de1ed9

* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:21:59 +00:00
Jinsuk Kim
7de1ed9d63 Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 2015-01-22 02:19:37 +00:00
Wonsik Kim
a80c07633b am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev automerge: 0313a0e 
* commit '67add1d26257eb298918a6e2c75f21afd59dadba':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 02:02:39 +00:00
Wonsik Kim
67add1d262 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 
automerge: 0313a0e

* commit '0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-22 01:54:49 +00:00
Wonsik Kim
0313a0e9b7 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 2015-01-22 01:52:08 +00:00
Craig Mautner
d56352dbcb am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
  Resume home activity can skip resume and cause ANR. DO NOT MERGE
 2015-01-22 00:29:56 +00:00
Craig Mautner
c79a8ea0c4 Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 2015-01-22 00:25:19 +00:00
Robert Greenwalt
ed25274e71 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
automerge: 9e7cb40

* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
  Fix legacy request removal.
 2015-01-22 00:00:43 +00:00
Robert Greenwalt
8379688475 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
automerge: 0343e1a

* commit '0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:59:09 +00:00
Robert Greenwalt
9e7cb40ddf am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
* commit 'ab42bbb9024d10579a913049147f6fc25b57df83':
  Fix legacy request removal.
 2015-01-21 23:56:07 +00:00
Robert Greenwalt
0343e1a704 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:56:02 +00:00