Amith Yamasani
5abd3b39bf
am 9fd0854d: Merge "Fix test" into jb-mr2-dev
...
* commit '9fd0854d2a875667b3662aff39d65831b5298cdf':
Fix test
2013-03-30 19:05:17 -07:00
Amith Yamasani
9fd0854d2a
Merge "Fix test" into jb-mr2-dev
2013-03-31 02:01:21 +00:00
Amith Yamasani
31c0959b1a
Fix test
...
Change-Id: I329ceff03d3707e10c2e4eabfb8e6ea61082ae6d
2013-03-30 19:00:30 -07:00
Amith Yamasani
15935aad3d
am 42bc734b: Merge "Block access to accounts for limited users." into jb-mr2-dev
...
* commit '42bc734b302f1fe68c031e013513535bed4c24f1':
Block access to accounts for limited users.
2013-03-30 18:34:57 -07:00
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
1ad4ce693f
am cac0e0b1: Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev
...
* commit 'cac0e0b11ba3f9f73ddb0ab18e136d61f700c356':
Add SELinux updater and Settings-based enforcement switch.
2013-03-30 15:11:18 -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
Jean-Michel Trivi
b839b83c73
Clean up role of component name in media button event receiver
...
A public API was added to AudioManager to register a media button
event receiver whithout having to supply a ComponentName.
This CL updates the comments that specified that the now optional
ComponentName parameter can be null, and never persist the button
event receiver is there is no ComponentName to persist.
Also unregistering the media button receiver makes no use of
the ComponentName anymore.
Change-Id: Idcfed1e2a85feb6fa178ca7797427f238705957c
2013-03-30 14:17:45 -07:00
Jean-Michel Trivi
3af2d3f1de
am 6f268369: Fix RemoteControlStackEntry constructor in AudioService
...
* commit '6f2683698ea1b316ae49623a7e9a13d9d9b53f71':
Fix RemoteControlStackEntry constructor in AudioService
2013-03-30 12:44:17 -07:00
Jean-Michel Trivi
6f2683698e
Fix RemoteControlStackEntry constructor in AudioService
...
Add missing call to constructor of RccPlaybackState to initialize
the mPlaybackState field of the RemoteControlStackEntry class.
bug 8512601
Change-Id: I636d5c1b416d6a3d3808d5be53c9c544ab293732
2013-03-30 12:35:51 -07:00
Amith Yamasani
5c98b90465
am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev
...
* commit '9e8ba8f27316c793578e68fcc6632a6ea6240f4a':
Improve RestrictionEntry API
2013-03-29 18:51:14 -07:00
Amith Yamasani
9e8ba8f273
Merge "Improve RestrictionEntry API" into jb-mr2-dev
2013-03-30 01:47:33 +00:00
Fabrice Di Meglio
68951ee958
am 83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev
...
* commit '83390182bfe50a3611d78b57ab2f3a8558ede2aa':
Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
2013-03-29 18:01:07 -07: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
Baligh Uddin
24480faa6b
Import translations. DO NOT MERGE
...
Change-Id: Idf70f5a7b5c553d0b7d96caa6e4a9dc2057a97fa
Auto-generated-cl: translation import
2013-03-29 17:34:35 -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
Elliott Hughes
1e61ea82f4
am 55e9d98d: Merge "Clarify the documentation of SparseArray.indexOfValue."
...
* commit '55e9d98d990f7a015d4c10f5e5a92ae131637073':
Clarify the documentation of SparseArray.indexOfValue.
2013-03-29 17:13:44 -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
Elliott Hughes
55e9d98d99
Merge "Clarify the documentation of SparseArray.indexOfValue."
2013-03-29 23:25:07 +00:00
kmccormick
160c0059f1
am 257719ec: am cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '257719ec2a6f1949a08900b4b5cc625f1f8d8c26':
Doc update: clarify dumpsys instructions
2013-03-29 16:21:11 -07:00
Michael Wright
068463337f
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 16:19:24 -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
Raph Levien
15b8c18503
Rename DroidNaskh UI font
...
Renames DroidNaskh-Regular-SystemUI to DroidNaskhUI-Regular to be
consistent with naming scheme for Noto fonts.
Change-Id: I3319ee5cd85360c85b0523bd932d461eb05d1b18
2013-03-29 16:13:36 -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
58db95970c
am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit 'e4ca0650eaad85ce5700ff99940c0acefed210bc':
Doc update: clarify dumpsys instructions
2013-03-29 16:11:48 -07:00
kmccormick
e4ca0650ea
am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '31ed1722b1e66211e7cbf55c2e9d55c1ce66b171':
Doc update: clarify dumpsys instructions
2013-03-29 16:09:26 -07:00
kmccormick
31ed1722b1
Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
2013-03-29 23:06:58 +00:00
kmccormick
cb937f23fd
am be1339ed: am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit 'be1339edc445eef19c3aa880b51a5c500cab6f82':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:06:42 -07:00
kmccormick
5614e4625d
am a92ca7fa: am a8858d21: am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit 'a92ca7fa3ec630aee14e51d87851749956bad875':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:06:39 -07:00
Kenny Root
7d164f660d
am 557ec556: Merge "KeyStore: add API to query storage type"
...
* commit '557ec55641d73db126db0c8e94ec70409814a7c1':
KeyStore: add API to query storage type
2013-03-29 16:04:51 -07:00
kmccormick
be1339edc4
am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:04:09 -07:00
kmccormick
a92ca7fa3e
am a8858d21: am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit 'a8858d215123b819557d130bfeeeb50568649b51':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:04:05 -07:00
Michael Wright
b09b5d42ec
am ee5880c9: Merge "Finish any event in the current input queue" into jb-mr2-dev
...
* commit 'ee5880c95a6f6528a2497e1cc9580880aa1c95ef':
Finish any event in the current input queue
2013-03-29 16:03:01 -07:00
kmccormick
328f7b7160
am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '90fa2ae28c200e0269f86f7d4e486ce781763a99':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:02:30 -07:00
kmccormick
a8858d2151
am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit '93c4446af02b3ccf6da5f8bd7ecb4b8b1cdf62d5':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:02:27 -07:00
kmccormick
f6dc107809
Doc update: clarify dumpsys instructions
...
"Bug: 8474578"
Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
2013-03-29 16:01:31 -07:00
kmccormick
90fa2ae28c
am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '23b55e78c86b09e806790d4f3ee47646216a9b87':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:00:06 -07:00
kmccormick
93c4446af0
am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit '75fa3012467117933d6afb7353b1c027bd446b72':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:00:03 -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
23b55e78c8
am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '3fab60bddb4ae719185f884ad167e5f16eaa4314':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 15:57:32 -07:00
kmccormick
75fa301246
am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit '18f76d621e001f6b717ac2519f374887fa620891':
Doc update: clarify guidelines for firewall setup.
2013-03-29 15:57:30 -07:00
kmccormick
3fab60bddb
am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '183c95e0c725d3f2f213d56cf98c24cf51dc848a':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 15:55:49 -07:00
kmccormick
18f76d621e
am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit 'a353a9f83e654f1b10ceab98ef03a7607737de70':
Doc update: clarify guidelines for firewall setup.
2013-03-29 15:55:47 -07:00
kmccormick
183c95e0c7
Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
2013-03-29 22:53:04 +00:00
kmccormick
b04c07fb9b
Doc update: PlaybackCompleted valid state 4 pause
...
"Bug: 7962402"
Change-Id: Ie41d7085373794e98208d8815010b3ca1d81378c
2013-03-29 15:50:03 -07:00
kmccormick
a353a9f83e
Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
2013-03-29 22:44:49 +00:00
kmccormick
b43fd58a10
Doc update: clarify guidelines for firewall setup.
...
Change-Id: Id3284bb21a0a2b612babf6cf582fda8f1c73cb80
2013-03-29 15:21:12 -07:00
kmccormick
306a5d0fe7
am da160ec3: am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit 'da160ec313d844b09818a91463631440a1b8a09c':
Doc update: incorrect method name
2013-03-29 14:58:50 -07:00