Amith Yamasani
42bc734b30
Merge "Block access to accounts for limited users." into jb-mr2-dev
2013-03-31 01:32:39 +00: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
Geremy Condra
cac0e0b11b
Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev
2013-03-30 22:08:20 +00:00
Amith Yamasani
9e8ba8f273
Merge "Improve RestrictionEntry API" into jb-mr2-dev
2013-03-30 01:47:33 +00:00
Fabrice Di Meglio
83390182bf
Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev
2013-03-30 00:58:51 +00: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
Geremy Condra
77118fb55e
Add SELinux updater and Settings-based enforcement switch.
...
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 16:52:56 -07:00
kmccormick
257719ec2a
am cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit 'cccf6e9b85e7f9e5f404137dde5dbd9db937592b':
Doc update: clarify dumpsys instructions
2013-03-29 16:18:40 -07:00
kmccormick
cccf6e9b85
am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '9f0ed0ee508b8f2233c8834f067e2fb8275d2cfa':
Doc update: clarify dumpsys instructions
2013-03-29 16:16:10 -07:00
kmccormick
9f0ed0ee50
am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '58db95970c9ba47dd83e06cc165d2dc5cc29ce8a':
Doc update: clarify dumpsys instructions
2013-03-29 16:13:12 -07:00
kmccormick
31ed1722b1
Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
2013-03-29 23:06:58 +00:00
kmccormick
f6dc107809
Doc update: clarify dumpsys instructions
...
"Bug: 8474578"
Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
2013-03-29 16:01:31 -07:00
Michael Wright
ee5880c95a
Merge "Finish any event in the current input queue" into jb-mr2-dev
2013-03-29 22:58:50 +00:00
kmccormick
da160ec313
am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit '6eebd6e6b44d7688489c430cad933e971530e43d':
Doc update: incorrect method name
2013-03-29 14:51:25 -07:00
kmccormick
6eebd6e6b4
am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit '6f50c846ad46dfeadf8eac389102031662ad892f':
Doc update: incorrect method name
2013-03-29 14:48:35 -07:00
kmccormick
6f50c846ad
am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit 'd2c1e947ea27ccea8060b0ef4509b3d6c90c4c51':
Doc update: incorrect method name
2013-03-29 14:46:53 -07:00
kmccormick
5018688b69
Merge "Doc update: incorrect method name" into jb-mr1.1-docs
2013-03-29 21:38:49 +00:00
kmccormick
f783ce5bcf
Doc update: incorrect method name
...
"Bug: 8177983"
Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00
2013-03-29 14:33:21 -07:00
Kenny Root
b381772246
Merge "KeyStore: add API to query storage type" into jb-mr2-dev
2013-03-29 21:24:35 +00:00
Kenny Root
5cb5cec6a4
KeyStore: add API to query storage type
...
Add an API to keystore daemon to query what kind of storage is currently
in use.
(cherry picked from commit a738e2a1ae )
Change-Id: I52c84449a27b1cefc49372a6406b7132c2bbddee
2013-03-29 14:21:10 -07:00
Michael Wright
bf02096088
Finish any event in the current input queue
...
When the pipelining optimization was added we never updated
handleImeFinishedEvent to look through the whole queue of items, so it was only
looking at the head.
Bug: 8498214
Change-Id: I79c62392a93b47e3e1eab3f4fe54a5c999dfb566
2013-03-29 14:06:43 -07:00
Jatin Lodhia
ce66fd7479
Merge "AccountManager changes for profile seeding." into jb-mr2-dev
2013-03-29 20:44:49 +00:00
Fabrice Di Meglio
b365f91688
Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
...
- use private flag bit field for ViewGroup.MarginLayoutParams
- make ViewDebug support "byte" type for FlagMapping
Change-Id: Iff7c31544e3ce2d29919c9424425f2bf87042b8b
2013-03-29 13:12:07 -07:00
Raph Levien
8fed6bc894
Merge "Make zero width space a line breaker" into jb-mr2-dev
2013-03-29 16:58:33 +00:00
Jean-Michel Trivi
bc43b4c2f2
RemoteControlClient can report current position, speed
...
Extend RemoteControlClient class to support reporting the
current playback position, and the playback speed.
Define listener for an application to receive new playback
position to seek to (use of listener to be implemented).
Update IRemoteControlDisplay implementations to new interface.
bug 8120740
Change-Id: I2654daeca1ac49713d325df8226dceb85943c020
2013-03-29 09:47:48 -07:00
Raph Levien
8d087c349f
Make zero width space a line breaker
...
This patch makes ZWSP (U+200B, zero width space) a potential line break
in text layouts. This is a fix for bug 8501809.
Change-Id: I18c1f8464e6c821ff75f819141bacc714a878700
2013-03-29 09:25:48 -07:00
kmccormick
326e8bf826
am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '84bba9528c5d3baf22656746255b74e72b4555ff':
Doc update: clarify rules for rate param
2013-03-28 18:10:08 -07:00
kmccormick
84bba9528c
am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '297409fefcfb2704162536562db9395903476b44':
Doc update: clarify rules for rate param
2013-03-28 18:07:59 -07:00
kmccormick
297409fefc
am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
...
* commit '3abd5a00ab24299de00b6dfa9c73ff59e3f3360c':
Doc update: clarify rules for rate param
2013-03-28 18:05:44 -07:00
kmccormick
6d9ff5033e
Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs
2013-03-29 01:00:11 +00:00
kmccormick
a230b3cb96
Doc update: clarify rules for rate param
...
"Bug: 5581113"
Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500
2013-03-28 17:58:57 -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
c9c63003b2
am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
...
* commit 'fd245a2ed78fd2b39c6d09ad0b1d84c275544c33':
Doc update: misc fixes
2013-03-28 16:43:26 -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
Matthew Xie
84e594f7db
Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
2013-03-28 23:04:48 +00: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
kmccormick
80ab68ce23
am 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '5c3ddcd14b79c4737ea06f68d8efd39543d60382':
Doc update: superceeded > superseded
2013-03-28 15:30:46 -07:00
kmccormick
5c3ddcd14b
am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '425c3d5f59f1e315cdbdd5f7530c4380aabf76ab':
Doc update: superceeded > superseded
2013-03-28 15:27:54 -07:00
kmccormick
425c3d5f59
am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
...
* commit '99049335a604cae3f515fce32bc5f1b27fe8d29b':
Doc update: superceeded > superseded
2013-03-28 15:26:25 -07:00
kmccormick
689e827aa3
Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
2013-03-28 22:21:12 +00:00
kmccormick
ac66b85a04
Doc update: superceeded > superseded
...
"Bug: 5935672"
Change-Id: Ie2324d00d454cf3f3f3ed422dea2017b8a7a4c54
2013-03-28 15:19:06 -07:00
Eric Laurent
7692d1f165
Merge "Display vibrate icon in volume panel" into jb-mr2-dev
2013-03-28 22:08:05 +00:00
Elliott Hughes
94eaab4a5d
am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
...
* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30':
Correct executable bit for source files [Take 2]
2013-03-28 14:29:21 -07:00
Elliott Hughes
3ae3048377
am a19647d3: Merge "Correct executable bit for source files [Take 2]"
...
* commit 'a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
Correct executable bit for source files [Take 2]
2013-03-28 14:27:09 -07:00
Ying Wang
b162617143
Fix doc build.
...
Change-Id: I479df06f2aed33bf29bb8d90be2339a80248beaa
2013-03-28 13:50:40 -07:00
Elliott Hughes
a19647d3d8
Merge "Correct executable bit for source files [Take 2]"
2013-03-28 20:50:34 +00: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
e494a81f9b
Merge "Restricted account visibility" into jb-mr2-dev
2013-03-28 20:31:44 +00:00
Craig Mautner
54241a31e9
Merge "Add flag to method's javadoc." into jb-mr2-dev
2013-03-28 19:41:19 +00:00