13174 Commits

Author SHA1 Message Date
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings.
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
2013-04-17 15:26:10 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Christopher Tate
0bd7a2f271 am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev
* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly
2013-04-17 11:11:30 -07:00
Christopher Tate
effb153aba Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 2013-04-17 18:08:19 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
2013-04-17 10:44:44 -07:00
Christopher Tate
1b64598602 Lengthen the AM timeout reading crash reports slightly
We're missing some (small fraction of) native crash reports from
debuggerd.  It looks like under high system load the debuggerd
reporting code just isn't quite timely enough for the very short
timeouts initially deployed, so lengthen those a bit.

Bug 8552010

Change-Id: Icbc5b6517de3bb98fff1af2ea42ffd208ef20412
2013-04-17 10:40:02 -07:00
Daniel Sandler
74c69f1e0c am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev
* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
2013-04-17 09:07:02 -07:00
Daniel Sandler
66769767b6 Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 2013-04-17 16:04:33 +00:00
Daniel Sandler
3147523c10 Treat the default sound Uri the same as DEFAULT_SOUND.
For the purposes of deciding whether or not to invoke the
"fallback vibrate", that is. (RingtonePicker will return
content://settings/system/notification_sound when "Default"
is chosen, so if the app pops this Uri directly into
Notification.sound, we should treat it like DEFAULT_SOUND
and look to see whether the system notification sound is
not None before running the fallback vibration.)

Bug: 8627641
Change-Id: Ia469b8e4d5d7647ce1a8a179f591ed7a3443b5c5
2013-04-17 10:59:50 -04:00
Satoshi Kataoka
7987a3172b Fix possible NPE
Bug: 8517083
Change-Id: Iea6bdcb0e39ee951b7f90f41cd3350bd1c7c5f71
2013-04-17 18:59:33 +09:00
Jim Miller
187ec581c6 Move owner info from Settings.Secure to LockSettings
Fixes bug 8512972

Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
2013-04-16 18:33:43 -07:00
Ben Gruver
e920a298f7 am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
* commit '53f22ad9c30e03f4762737a722b2762dcf934523':
  Monitor the firewall rules file for changes
2013-04-16 17:47:57 -07:00
Ben Gruver
53f22ad9c3 Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 2013-04-17 00:44:56 +00:00
Svetoslav
a60c8c25fd am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev
* commit '8297e68d84a6edc8ecb6d17d5ba2043075f921ff':
  BinderDied may be called after we unregistered the death recipient.
2013-04-16 11:30:18 -07:00
Svetoslav
8297e68d84 Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 2013-04-16 18:27:43 +00:00
Stan Chesnutt
464f4ea355 am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
* commit 'b34b3211e01b0ae946f786b220f73d340159503b':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
2013-04-15 19:52:52 -07:00
Stan Chesnutt
b34b3211e0 Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 2013-04-16 02:49:45 +00:00
Stan Chesnutt
1d72d8c33d Re-introduce single-shot mode, set MS Assist Mode A when in
single-shot mode.

Fixes bug http://b.corp.google.com/issue?id=8204392

Change-Id: I5594447c75abab6b71bd12706409666bb75736c5
2013-04-15 19:18:02 -07:00
Daniel Sandler
0a8ed3f214 am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
* commit '4b6d23d7b45f813bee52747b3243ce46ff9edbd0':
  Further reduce memory usage of notification archive.
2013-04-15 18:48:06 -07:00
Daniel Sandler
4b6d23d7b4 Merge "Further reduce memory usage of notification archive." into jb-mr2-dev 2013-04-16 01:44:11 +00:00
Daniel Sandler
5e62e3aa7d Further reduce memory usage of notification archive.
- Max 250 notifications preserved (was 1000)
- Known heavyweight extras are removed
- print some of 'em out in dumpstate, while we're at it

Bug: 8280039
Bug: 8537938
Change-Id: I9239128c32a1d9f5ef4e0dc62dc2d23e190871e9
2013-04-16 01:43:49 +00:00
Daniel Sandler
220fa85eac am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev
* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
  Finish annotating Notification.extras.
2013-04-15 18:42:33 -07:00
Daniel Sandler
f094d221e5 Merge "Finish annotating Notification.extras." into jb-mr2-dev 2013-04-16 01:38:54 +00:00
David Christie
e8ae4eafea am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev
* commit 'feedb1b095f94e4bd153aeee78da07d963892071':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
2013-04-15 16:39:08 -07:00
David Christie
feedb1b095 Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev 2013-04-15 23:35:44 +00:00
Svetoslav
2602a3974a BinderDied may be called after we unregistered the death recipient.
It is possible that an accessibility service's package was force stopped
during whose handling the death recipient is unlinked and still get a call
on binderDied since the call was made before we unlink but was waiting on
the lock we held during the force stop handling. Added a check whether the
service is already disconnected and if so do nothing.

bug:8600388

Change-Id: I4a9ca305b9863d986b930a7c1ec8f9006b16a333
2013-04-15 16:30:12 -07:00
Dianne Hackborn
f5cfab41c3 am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev
* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
  Fix issue #8512015: VideoView's window animates when its position changes
2013-04-15 16:25:05 -07:00
Dianne Hackborn
a59a19abb8 Merge "Fix issue #8512015: VideoView's window animates when its position changes" into jb-mr2-dev 2013-04-15 23:22:48 +00:00
Geremy Condra
baa58cdb9f am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.
2013-04-15 16:13:56 -07:00
Geremy Condra
bffe377bca Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 2013-04-15 23:11:12 +00:00
David Christie
1b9b7b1f1b Fix security issues with LocationManager where apps with coarse permissions
can get location updates too frequently by repeatedly calling getLastKnownLocation
or by registering/unregistering location updates frequently.

Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
2013-04-15 15:31:11 -07:00
Dianne Hackborn
1c5383ce0b Fix issue #8512015: VideoView's window animates when its position changes
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
2013-04-15 15:07:21 -07:00
Geremy Condra
f33575b05b Add logic to handle changes to file_contexts during update.
Bug: 8116902

(cherry picked from commit a2dffda3b3bc4f0bccb175ef4569e45a221d0eb2)

Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
2013-04-15 14:56:58 -07:00
Svetoslav
7919ea9866 am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
  Crash on non-eng builds due to lacking null check.
2013-04-15 14:56:24 -07:00
Svetoslav
f9dd9338d0 am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev
* commit '289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
  Fully setup newly bound service before state management.
2013-04-15 14:56:21 -07:00
Svetoslav
7af3d0560d Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 2013-04-15 21:52:07 +00:00
Svetoslav
289e64974a Merge "Fully setup newly bound service before state management." into jb-mr2-dev 2013-04-15 21:51:22 +00:00
Svetoslav
1487cd5afc Crash on non-eng builds due to lacking null check.
On eng builds we have an event consistency verifier to log any
inconsistent event stream states due to mishandling of intercepted
events by an accessibility service. On non-eng builds this verifier
is null and a null check was lacking.

bug:8616711

Change-Id: Ib083a405dfa8340025090a65e50155eb10526a90
2013-04-15 12:28:46 -07:00
Svetoslav
072906eef8 Fully setup newly bound service before state management.
If the connected service is not entirely setup when calling the method for
handling a change in the current user state we get a potential NPE since
the management method may have discarded the service, thus nullifying the
connection to it. Now the service is fully configured before calling the
state change management method.

bug:8600489

Change-Id: Ib0bf7c6d575e15c620da419d43ece22f4187fd34
2013-04-15 12:16:20 -07:00
Daniel Sandler
f45564ee72 Finish annotating Notification.extras.
This covers all useful data from the basic Builder as well
as each of the Styles that is not otherwise captured on the
Notification object itself.

Extras are now prettyprinted in dump() output.

Bug: 8270485
Change-Id: I47fc50860dab6409793f57e904cc60296310d5cf
2013-04-15 15:05:08 -04:00
Kenny Root
e28b084d14 Remove keystore entries when app data cleared
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.

(cherry picked from commit 6fd1c85d7f909580582e5ebc357564331ecef283)

Bug: 8566369
Change-Id: Id4df5e50661b676b8f6507b915764400982c01a0
2013-04-15 10:57:24 -07:00
Kenny Root
fc78e60a83 Check outInfo is not null
Only call keystore if outInfo is not null

(cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c)

Bug: 8568820
Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
2013-04-15 10:42:14 -07:00
Svetoslav Ganov
dd03b6dcb7 am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev
* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
  Allow for setting test type as a monkey.
2013-04-12 17:17:59 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Emily Bernier
9b8abb5abd am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
* commit 'ce70311b67c3dba6ed4fbda41617f4e24c82dfc7':
  Add user restrictions (credentials, user removal)
2013-04-12 13:25:58 -07:00
Emily Bernier
ce70311b67 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 2013-04-12 20:21:36 +00:00
Adam Momtaz
8f6f1f43ee Allow for setting test type as a monkey.
1. This allows UiAutomation type tests to run as if an
   android monkey test is running. This allows applications
   that recognize that they are drive by a test framework and
   avoid performing certain actions such as calling 911.

2. Fixed a bug where the UiAutomation#disconnect() was not
   called when the instrumentation is shutdown.

bug: 8588857

Change-Id: I9e3624dfbe2b8f81f27805711de1098ea2edd03d
2013-04-12 12:54:34 -07:00