Commit Graph

1531 Commits

Author SHA1 Message Date
Mike Lockwood
853ad6fbe3 Remove obsolete OMA-DRM support
Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c
2013-04-29 16:48:13 -07:00
Alon Albert
82d11c847e am d2b8cd75: am adff8b75: Merge "Add Javadoc" into jb-mr2-dev
* commit 'd2b8cd75ed4ec9d9076699792bd78152885e304f':
  Add Javadoc
2013-04-18 14:43:40 -07:00
Alon Albert
adff8b7577 Merge "Add Javadoc" into jb-mr2-dev 2013-04-18 21:36:33 +00:00
Alon Albert
d35bf1f5eb Add Javadoc
Bug: 8657225
Change-Id: Id3cc191ea67011460604a691214b9b09075c5938
2013-04-18 14:28:38 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
2013-04-17 14:18:56 -07: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
Chiao Cheng
24fafc4cf5 am 3e41c7c9: am 2355d131: Adding public api support for finding contact changes.
* commit '3e41c7c9baf58f49f06aec1bb9c3dcaf614e616e':
  Adding public api  support for finding contact changes.
2013-04-09 14:26:06 -07:00
Chiao Cheng
2355d13154 Adding public api support for finding contact changes.
DeletedContacts holds a log of deleted contacts which will be pruned
after a certain amount of time.

A timestamp field has been added to contacts so clients can query
for changes.

Bug: 8182147
Change-Id: Ic6e56e567892712da3c3941400dfb3ddc565aaac
2013-04-09 14:12:31 -07:00
Yorke Lee
8f6ed23997 am 855841cc: am cf837a6e: Merge "Update DataUsageStatColumns" into jb-mr2-dev
* commit '855841cce47bddf5ba758112fcf355a160c7e5f1':
  Update DataUsageStatColumns
2013-04-08 14:28:50 -07:00
Yorke Lee
cf837a6e90 Merge "Update DataUsageStatColumns" into jb-mr2-dev 2013-04-08 21:22:06 +00:00
John Spurlock
8740cb1da6 resolved conflicts for merge of 29211d3a to master
Change-Id: I9691f41b12fbf52d0ef35a9bf5223edef7afdfd2
2013-04-05 16:18:59 -04:00
Daniel Sandler
5feceebb89 New NotificationListenerService.
This is the best and only way for apps to listen for
notifications: create a NotificationListenerService, wait
for the NoMan to bind to you (as a result of the user
checking a box somewhere in Settings and agreeing to a
scary dialog box), and you'll start receiving notification
posted and dismissed callbacks. Your service, while enabled,
will also be able to clear one or all notifications.

Use this power wisely.

This change moves StatusBarNotification out of
com.android.internal into android.service.notification.
[Internal customers, including System UI and early users of
the system-only listener binder API, will need to be
updated.]

Bug: 8199624
Change-Id: I1be46f823d4b3ddc901109ec1e085cd6deb740c2
2013-04-05 19:54:44 +00:00
Ben Gruver
60765b285d am a1607a8c: am 65f420ec: Merge "Add a config updater component for the intent firewall" into jb-mr2-dev
* commit 'a1607a8c62a630150b4e96ec1148e90dc40ab984':
  Add a config updater component for the intent firewall
2013-04-05 09:41:34 -07:00
Ben Gruver
633dc9bcef Add a config updater component for the intent firewall
Change-Id: I43f6defa16691099592bf87e75f2d1a732135cf3
2013-04-04 19:46:22 -07:00
kmccormick
b471da283e am b85e328d: am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit 'b85e328d380f3cd992302d3d36fbdce454990e64':
  Doc update: fix broken code sample
2013-04-03 15:03:53 -07:00
kmccormick
bbcf0852f7 am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
  Doc update: fix broken code sample
2013-04-03 14:30:09 -07:00
kmccormick
9d9365916d am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
  Doc update: fix broken code sample
2013-04-03 14:26:34 -07:00
kmccormick
e4ce502d77 Doc update: fix broken code sample
"Bug: 8537853"

Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
2013-04-03 14:13:36 -07:00
Yorke Lee
5a53d70428 Update DataUsageStatColumns
No longer expose the usage_type column. Instead, we return the
total number of times the data item was used, across all usage types.

Change-Id: I56bef7f1090405d7d0256d0a1c6ca96b38f923d6
2013-03-29 18:10:23 -07:00
Geremy Condra
77118fb55e Add SELinux updater and Settings-based enforcement switch.
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 16:52:56 -07:00
Geremy Condra
757ee52725 Fix a comment to fix the build.
Change-Id: I9acfef97572bbb0438afbc95df6a718ba506c2c4
2013-03-29 16:39:45 -07:00
Geremy Condra
4e7f7e839e Add SELinux updater and Settings-based enforcement switch.
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 15:48:15 -07:00
Geremy Condra
a0735118c6 Add ConfigUpdater settings values to the global table.
This is a partial fix to a bug caused by not properly migrating
these values from secure: to global:

Change-Id: Iaed77b5ab671f9cd229c7883ae09a0b4a5f3c64e
2013-03-29 15:48:07 -07:00
kmccormick
eff1151d6c am 0de7af1e: am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '0de7af1e18a72a979baa9711e4e980b21cf80255':
  Doc update: misc fixes
2013-03-28 16:47:25 -07:00
kmccormick
0de7af1e18 am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit 'c9c63003b2e30c068a1bc9eba7683b75ca272180':
  Doc update: misc fixes
2013-03-28 16:45:16 -07:00
kmccormick
50e27c8135 Doc update: misc fixes
"Bug: 3424410"

Some of these had already been fixed.

Change-Id: I1d0ab3a8fa51aa308186059db4186e7a7d24e9f8
2013-03-28 16:33:46 -07:00
Yorke Lee
2e73f5b8b7 Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev 2013-03-27 19:14:09 +00:00
Yorke Lee
0dc523fa99 Expose data_usage_stat table in ContactsContract
Bug: 8124079
Change-Id: Ie60e489f08be270b9f3a4866c488a5e0598ceb26
2013-03-27 12:07:52 -07:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Wink Saville
c1b40c79be Merge "Add some new constants." into jb-mr2-dev 2013-03-22 21:41:31 +00:00
Daniel Sandler
dc0299fb23 Merge "Allow whitelisted non-system packages to listen for notifications." into jb-mr2-dev 2013-03-21 22:01:59 +00:00
Irfan Sheriff
7b7beb7952 Notify user when wi-fi is toggled about scans
We let the user know when he turns off Wi-Fi that scans will continue to
be available.

User has the option to turn off the dialog and not receive this in the future.

Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
2013-03-21 12:27:20 -07:00
Wink Saville
75c1e69bd5 Add some new constants.
Add EVENT_DISCONNECT_DC_RETRYING, EVENT_SETUP_DATA_COMPLETE_ERROR
and State.RETRYING to DctContants.

Add MDC_INITIAL_MAX_RETRY to Settings.Global.

Bug: 4772191
Change-Id: Id54a20ab192783c63939158670faaf531a527640
2013-03-21 07:20:05 -07:00
Daniel Sandler
4b749ef5f2 Allow whitelisted non-system packages to listen for notifications.
The allowed packages are listed in
Settings.Secure.ENABLED_NOTIFICATION_LISTENERS. (Don't let
the plural fool you: only one listener will be supported in
the UI.)

Change-Id: Ia69f2ba05d8e555fd4d40b0cc89c62ed14af3cac
2013-03-21 01:41:20 -07:00
Irfan Sheriff
11aefad94d Add support for scan always available mode
Modify WifiService to add a controller to track the various
desired states and let the WifiStatemachine actually control
the bring up.

Bug: 8141918

Change-Id: I6e98fd5a29b43c3c50c315eff5255cd0a3eaebcd
2013-03-14 13:55:56 -07:00
Yorke Lee
4f401ebf14 Add new apis to CP2
Add Data.Contactables.CONTENT_URI and CONTENT_FILTER_URI
Add VISIBLE_CONTACTS_ONLY boolean parameters to Data

Bug: 8123918

Change-Id: I8cef7a66d4ab0b910cba7feb158ec007f318f5a8
2013-03-12 11:05:03 -07:00
Alon Albert
50359c26e7 Document extra account_types
The action android.settings.ADD_ACCOUNT_SETTINGS supports an extra
"account_types" (See AddAccountSettings & ChooseAccountActivity) but
that's not documented anywhere.
Oddly, the other 2 places that support the "authorities" extra do not
also support "account_types".

Change-Id: I99b7be0b0d6fff1cbccdf8b8b8e4fd2be9548e6c
2013-02-26 14:54:07 -08:00
Jeff Sharkey
ead9389fd2 Remove throttle settings, no longer needed.
Since the throttle feature has been removed, its configuration
settings are no longer needed.

Change-Id: Iaf3cb74a372d43d580f42566d21843a2eb653d3e
2013-02-14 09:52:42 -08:00
Craig Mautner
005f6f6077 Merge "Reset SensorEventListener when listener reenabled." 2013-02-11 17:47:14 +00:00
Craig Mautner
eee29c445c Reset SensorEventListener when listener reenabled.
- Following disable and reenable of the WindowOrientationListener
the state was the same as before. State should be reset to default.

- Provide a Handler to the sensor task to deliver events on the
same Thread that WindowManagerPolicy operates on.

- Expand lock protection to all of WindowOrientationListener.

- Move WindowOrientationListener to policy package.

- Make SensorEventListenerImpl non-static.

Fixes bug 7964531.

Change-Id: I17cecf3d0b6d125cb3e4d7350c3adb3f62b684bd
2013-02-11 09:46:08 -08:00
Marco Nelissen
70a0327abd am 85a1ee30: am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '85a1ee30215190b1782127a6afe323f4df4ef131':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
2013-02-08 11:42:43 -08:00
Marco Nelissen
b683f3542a am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
2013-02-08 08:41:20 -08:00
Jan Bjernler
66eb589957 MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.

Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
2013-02-08 16:17:23 +00:00
Alon Albert
2c45e91373 Merge "Add Calendar Color Index to CalendarEntity" 2013-02-07 19:55:09 +00:00
Alon Albert
0114112203 Add Calendar Color Index to CalendarEntity
Change-Id: I8dac2628fce44e37e5df1e19a97fc29934a6ba79
2013-02-07 11:50:27 -08:00
Alon Albert
0a35dd5660 Copy EVENT_COLOR_KEY as String
Change-Id: I84eda41d0b9c091f3d152cc3e899cb40b52ed949
2013-02-05 11:07:56 -08:00
Alon Albert
971c28b831 Add EVENT_COLOR's to Event Entity Iterator
Bug: 8132457
Change-Id: Id6ace96532aa745c1b36290b525dfdf154fe2134
2013-02-04 13:49:50 -08:00
Jeff Sharkey
54781207d3 Define failed connections column, and reset.
When retrying a download, always reset the failed connections count.

Bug: 8022478
Change-Id: I0d799d82dc7a04fe788b8c5faee0045d1e1a9c60
2013-01-17 17:27:33 -08:00
Dianne Hackborn
35654b61e8 More work on App Ops service.
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).

Also implement tracking of read/write ops on contacts and the
call log.  This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service.  The contacts provider and call
log provider turn this on for themselves.

This also implements some of the mechanics of being able to ignore
incoming provider calls...  all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).

Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
2013-01-16 12:11:01 -08:00
Scott Kennedy
57b59e025b am aebeea4c: am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit 'aebeea4cf39acae833b1b7f27a4c08d3b55dee37':
  docs: Fix a bunch of issues
2013-01-14 11:19:13 -08:00