5081 Commits

Author SHA1 Message Date
Kenny Root
5b7e90ac93 Add API to query KeyChain algorithm support, pt. 2
Late-breaking comments on API name. Revised.

Bug: 7095660
Change-Id: I7224d9c8a4f84a272360ede78a18bfb72d8aeb77
2013-04-02 11:23:41 -07:00
Kenny Root
20309b0df8 am 5c45d95b: am 1ea4a5ba: Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev
* commit '5c45d95b837fc6adb7eb16816f3e2581fc527803':
  Add API to query KeyChain algorithm support
2013-04-02 11:04:41 -07:00
Jeff Brown
76703d8fe5 am 21b41af7: am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev
* commit '21b41af7ea418be8e0ec94800bb2d0cc12c4965e':
  Make MessageQueue and Looper final.
2013-04-02 11:03:04 -07:00
Kenny Root
1ea4a5ba85 Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev 2013-04-02 17:52:26 +00:00
Kenny Root
bf556ac636 Add API to query KeyChain algorithm support
Bug: 7095660
Change-Id: Ia87caaa33bc01b032130811833f0a3c4f75b62d4
2013-04-02 10:34:24 -07:00
Jeff Brown
67fc67cf3e Make MessageQueue and Looper final.
Applications already cannot subclass these classes because
their constructors are not visible.

Change-Id: Id979d86dd05f7bcc888fe4ea499ab9b95d3d5dde
2013-04-01 14:27:57 -07:00
Amith Yamasani
bb49e8573e resolved conflicts for merge of 15935aad to master
Change-Id: I9664186a62cf7b11844c6a14967f5b8c2b67c289
2013-03-30 19:26:37 -07:00
Amith Yamasani
27db46850b Block access to accounts for limited users.
Make sure that apps that have access to restricted accounts can see them.
If they don't have access, they shouldn't be able to add a new account either.
Show an error message in the account picker if the user/app is not authorized.

Change-Id: I117c0b14d7d06c5ac4e66506df156b174567f5f3
2013-03-30 18:25:49 -07:00
Amith Yamasani
8d01846130 am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev
* commit '5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
  Improve RestrictionEntry API
2013-03-29 18:52:58 -07:00
Amith Yamasani
9e8ba8f273 Merge "Improve RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:47:33 +00: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
Amith Yamasani
86118baa4f Improve RestrictionEntry API
More getters and setters, better naming.
New extra defined for returning a custom intent that handles showing the
   restrictions UI.

Change-Id: I2ee0cdb4edd99e71a9004ff5e929dbe243b45557
2013-03-29 17:28:47 -07:00
Jatin Lodhia
278700fdb9 am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
  AccountManager changes for profile seeding.
2013-03-29 14:36:14 -07:00
Jatin Lodhia
ce66fd7479 Merge "AccountManager changes for profile seeding." into jb-mr2-dev 2013-03-29 20:44:49 +00:00
Matthew Xie
3f9560261f am e4eb23ec: am 84e594f7: Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
* commit 'e4eb23ecc232c508974976844df2ea8c44025fe9':
  Unhide Bluetooth Low Energy public APIs
2013-03-28 16:10:03 -07:00
Matthew Xie
ddf7e4756c Unhide Bluetooth Low Energy public APIs
Updated API headers. Add BluetoothManager to be retrieved by
context.getSystemService(Context.BLUETOOTH_SERVICE).
LE scan functions are placed in BluetoothAdapter
The GATT API are device driven instead of a profile-driver.
bug 8450158

Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
2013-03-28 15:36:10 -07:00
Amith Yamasani
6258469c7f Update current.txt due to new API upstream.
Should fix the build.

Change-Id: Iebf9d0606e262af30b6495d42bcb1a69a67bebc6
2013-03-28 14:17:37 -07:00
Jatin Lodhia
3df7d697ca AccountManager changes for profile seeding.
Add a new error code to AccountManager and remove the check for
limited user during add account to allow Authenticators to seed
account during limited profile startup.

Change-Id: I5a73def9fc3baeb8e6de1b42e923829c335e1668
2013-03-28 13:46:58 -07:00
Amith Yamasani
b54a93adaf am 1438d67e: am e494a81f: Merge "Restricted account visibility" into jb-mr2-dev
* commit '1438d67e7ddaba1133f181bc70cd706acf57a520':
  Restricted account visibility
2013-03-28 13:36:52 -07:00
Amith Yamasani
e494a81f9b Merge "Restricted account visibility" into jb-mr2-dev 2013-03-28 20:31:44 +00:00
Maggie Benthall
c78453f12b am b3c060a1: am c92342bb: Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev
* commit 'b3c060a166e9d5a141a6500e4c443a20d4e002b6':
  Add user restrictions for bluetooth, sideloading, usb file transfer
2013-03-28 12:20:05 -07:00
Maggie Benthall
c92342bb01 Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev 2013-03-28 19:15:46 +00:00
Jeff Brown
4cf9e46180 am bdecb574: am 0aba3b18: Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev
* commit 'bdecb5749753a4706e027589bbf58d985063d7cd':
  Support specifying buffer start offset for USB requests.
2013-03-28 11:59:41 -07:00
Jeff Brown
0aba3b18a8 Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev 2013-03-28 18:53:33 +00:00
Jeff Brown
6c81a93ef3 Support specifying buffer start offset for USB requests.
Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.

Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.

Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
2013-03-28 03:13:09 -07:00
Amith Yamasani
0ac1fc9d23 Restricted account visibility
When accounts are shared to a restricted/limited user, apps can
opt-in to viewing accounts of a certain type. Other shared accounts
are not visible to the app.

App would specify the account type in the manifest <application> tag
with the attribute restrictedAccountType="foo.bar", where "foo.bar"
is the account type as defined by the authenticator.

Change-Id: I7586da04d6d6d32aae15adc6b1366f325bb07384
2013-03-27 18:56:08 -07:00
Nick Kralevich
adb2578a05 am 96e44a2c: am 98ea19ed: Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev
* commit '96e44a2c2ce0579177c50a4fb710adc83530e968':
  Reenable optional permissions parsing and expose APIs
2013-03-27 17:24:15 -07:00
Nick Kralevich
98ea19ed24 Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev 2013-03-28 00:13:45 +00:00
Nick Kralevich
828c16f140 Reenable optional permissions parsing and expose APIs
Modify the package parsing code to understand optional permissions
(android:required="false"). This is essentially a rollback of
e824120016248bcfe3962883fe9f3b0481dd1c3d with some minor changes.

Expose the requestPermission API to third party apps. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.

In the event we decide to not launch with this feature, this change
can be rolled back.

Change-Id: Ie3626deae9b16e510323f94a2c80377f7c84b26f
2013-03-27 16:57:33 -07:00
Maggie Benthall
a12fccf57d Add user restrictions for bluetooth, sideloading, usb file transfer
Created constants for these in UserManager and current.txt. Also created
an accessor for individual user restrictions that takes the restriction key
(removing individual methods for particular restrictions).

Change-Id: Ibb5517cbcdffadd3925f52cbe67d7d525813faa9
2013-03-27 18:14:29 -04:00
Tim Murray
da13653964 am 25440d39: am 8ff0201a: Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev
* commit '25440d39ed679c33303fc23ada0b862fda4d5444':
  Revert "Remove all public mention of RS graphics from docs."
2013-03-27 14:37:07 -07:00
Tim Murray
8ff0201ad0 Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 2013-03-27 21:32:31 +00:00
Tim Murray
275812c2bb Revert "Remove all public mention of RS graphics from docs."
This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190

Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
2013-03-27 21:31:28 +00:00
Tim Murray
40f897a312 am 0e39ae10: am 8565520b: Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev
* commit '0e39ae1073c38afbce02f8470dcc717fd91f9751':
  Remove all public mention of RS graphics from docs.
2013-03-27 14:08:18 -07:00
Tim Murray
8565520b85 Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 2013-03-27 21:01:37 +00:00
Yorke Lee
295a059795 am 7b1948b3: am 2e73f5b8: Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev
* commit '7b1948b3b99db4ad2af3cdc7f8625b6ac70fab93':
  Expose data_usage_stat table in ContactsContract
2013-03-27 12:19:23 -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
Jean-Michel Trivi
8c9202b147 am 45554779: am f2b0fdb2: Merge "AudioEffect types in SDK" into jb-mr2-dev
* commit '455547795cdec66972546bbfd60d8697f5d8477e':
  AudioEffect types in SDK
2013-03-27 10:40:58 -07:00
Jean-Michel Trivi
f2b0fdb2f7 Merge "AudioEffect types in SDK" into jb-mr2-dev 2013-03-27 17:35:44 +00:00
Sungmin Choi
52a08cf683 make new API to retrieve group identifier level1
For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

bug:6445254
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
2013-03-27 17:24:55 +00:00
Jean-Michel Trivi
80569f7ff7 AudioEffect types in SDK
Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16
2013-03-27 09:59:24 -07:00
Yorke Lee
778fde704a am 6b141509: am 038fbc5d: Merge "Add new apis to CP2" into jb-mr2-dev
* commit '6b141509ea8746e7ee50c8eb4d652e72864cd5e1':
  Add new apis to CP2
2013-03-27 09:51:26 -07:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Amith Yamasani
a1535223fe am f3dc9f0a: am df5e9fe1: Merge "Device Owner, a special kind of device admin" into jb-mr2-dev
* commit 'f3dc9f0aa91d2785b715f251b144487ec1b57ecc':
  Device Owner, a special kind of device admin
2013-03-26 15:31:33 -07:00
Amith Yamasani
df5e9fe181 Merge "Device Owner, a special kind of device admin" into jb-mr2-dev 2013-03-26 22:27:13 +00:00
Amith Yamasani
71e6c697e5 Device Owner, a special kind of device admin
A Device Owner cannot be uninstalled and is available to all users. It must
be registered before the device_provisioned flag is set.

Device admins can be disabled until used, but visible to device policy
manager, so that users wont be bothered with update requests.

Opened up a few related APIs for use by a system-installed Device Owner.

Change-Id: I847b5fe68c0f724863f778a67602b5bddc79d8e5
2013-03-26 15:09:08 -07:00
Guang Zhu
f63b15cb82 fix build: followup API change
Change-Id: I27e04a905c07491489c22e6fbdb73181f5dd4eb4
2013-03-25 21:49:51 -07:00
Fabrice Di Meglio
2a293a84b0 am 23ac93c3: am 172fc865: Merge "Fix the build" into jb-mr2-dev
* commit '23ac93c3e4abde239848aa99131d44a9c3859fad':
  Fix the build
2013-03-26 02:25:16 +00:00
Fabrice Di Meglio
768f272976 Fix the build
See bug #8200928

Change-Id: I014590f41d74f16cf3c3de618ef08ee490bf05aa
2013-03-25 19:18:18 -07:00