OSDN Git Service
Amith Yamasani [Fri, 19 Jul 2013 19:39:17 +0000 (12:39 -0700)]
New permission to manage device admins
The previously used permission was doing double duty as the permission
that device admins to check for to ensure that calls are coming from valid
system components.
MANAGE_DEVICE_ADMINS is system|signature and is now required to add/remove
device admins.
Required for:
Bug:
9856348
Change-Id: I64385d2ec734c3957af21b5a5d9cffd8a3bcd299
Joe Fernandez [Fri, 19 Jul 2013 21:40:01 +0000 (14:40 -0700)]
am
b9aa1789: am
379cb6b7: am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
b9aa1789ee221c45bd3c01bae4ae99d7965c1437':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 21:30:49 +0000 (14:30 -0700)]
resolved conflicts for merge of
f9774dc7 to master
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
Scott Main [Fri, 19 Jul 2013 21:22:14 +0000 (14:22 -0700)]
am
8b5f79a0: am
a74517d2: am
ca3b4e9b: remove significant motion
* commit '
8b5f79a0cb72af51a057c27ca3f0511076577e1f':
remove significant motion
Scott Main [Fri, 19 Jul 2013 21:22:12 +0000 (14:22 -0700)]
am
a12d5e0d: am
52a74a21: am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
a12d5e0dcab49fb02cac3e7982f1ad0ecf170a40':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 21:22:09 +0000 (14:22 -0700)]
am
8d6d93c3: am
1cf7b4a4: am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
8d6d93c3b2ed41324d2bcf8bbfc4c5a3b5d6416e':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 21:22:06 +0000 (14:22 -0700)]
am
64127efb: am
46cc4dbb: am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
64127efbe65f73a01cf15366e08406bf7cb537d9':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 21:09:30 +0000 (14:09 -0700)]
resolved conflicts for merge of
85b5e4c4 to master
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
Jean-Michel Trivi [Fri, 19 Jul 2013 20:42:39 +0000 (13:42 -0700)]
am
a8f7659a: am
f65c9189: am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
a8f7659aba2c9233fb61ae34dfc0d7477dc0ae91':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:42:36 +0000 (13:42 -0700)]
am
b96cca27: am
df43ba82: am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
b96cca27ba15121aab2c481786a292880c007bb6':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:42:34 +0000 (13:42 -0700)]
am
388f85eb: am
a2f41b23: am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
388f85eb451bd0b61c8f48b500de5db6bca941f1':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:42:30 +0000 (13:42 -0700)]
am
d96c6956: am
0f33e44f: am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
d96c6956807ca1644079a9e92d0e3af170c51c8f':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:42:27 +0000 (13:42 -0700)]
am
7afdf7f0: am
2445880c: am
ba8a5413: Fix missing lock in power manager.
* commit '
7afdf7f0514bebe1188e0c1bc60e76f853065e82':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:42:24 +0000 (13:42 -0700)]
am
70eac41f: (-s ours) am
a64325f6: am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
70eac41f7044552305beae86eb0978cd74724ecf':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:38:02 +0000 (13:38 -0700)]
am
379cb6b7: am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
379cb6b7f0f62009caeeda00a05d3185bc06b8aa':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 20:37:58 +0000 (13:37 -0700)]
am
ddf17b5b: am
8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit '
ddf17b5b82f25965502377588483abbc328c4e6d':
Make CS.isTetheringSupported dynamic
Scott Main [Fri, 19 Jul 2013 20:37:54 +0000 (13:37 -0700)]
am
a74517d2: am
ca3b4e9b: remove significant motion
* commit '
a74517d25d8258ed14d4cf4aab7cf82d6b51e729':
remove significant motion
Scott Main [Fri, 19 Jul 2013 20:37:50 +0000 (13:37 -0700)]
am
52a74a21: am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
52a74a2143274b2a3c5906cc882fa48d687b5cf8':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 20:37:47 +0000 (13:37 -0700)]
am
1cf7b4a4: am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
1cf7b4a438a01d2c018699e38332965b366f479c':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 20:37:44 +0000 (13:37 -0700)]
am
46cc4dbb: am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
46cc4dbb38968dadffcc5f78dd69d391768711e1':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 20:37:41 +0000 (13:37 -0700)]
am
b5bf655c: am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
b5bf655cc6cc9128aec99958cce3b054348c9273':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:37:38 +0000 (13:37 -0700)]
am
f65c9189: am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
f65c9189843ea55fc3e3c7154331c9f0ad330210':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:37:35 +0000 (13:37 -0700)]
am
df43ba82: am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
df43ba82e6c232985a95c9827f7d71dd3194e0a8':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:37:32 +0000 (13:37 -0700)]
am
a2f41b23: am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:37:28 +0000 (13:37 -0700)]
am
0f33e44f: am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0f33e44fbc2e506fce71bf087a0b18b7979daaf9':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:37:25 +0000 (13:37 -0700)]
am
2445880c: am
ba8a5413: Fix missing lock in power manager.
* commit '
2445880c5cb6504455bd5cae38a850744f4804be':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:37:22 +0000 (13:37 -0700)]
am
a64325f6: am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
a64325f6e70569255ff395a85ec161f3230f9e35':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:34:28 +0000 (13:34 -0700)]
am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
ab00d352ffc8a60cf4811cc79dd1dc69bc8ee407':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 20:34:22 +0000 (13:34 -0700)]
am
8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit '
8c87b29793da439b8718227bf2d03405c8ad264a':
Make CS.isTetheringSupported dynamic
Scott Main [Fri, 19 Jul 2013 20:34:04 +0000 (13:34 -0700)]
am
ca3b4e9b: remove significant motion
* commit '
ca3b4e9b7e5498650993dc99d70acacc1fa2d1fb':
remove significant motion
Scott Main [Fri, 19 Jul 2013 20:34:02 +0000 (13:34 -0700)]
am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
1be763494e9df0d1477dcaa4ba0163cce68f416a':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 20:33:58 +0000 (13:33 -0700)]
am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
d3ed45f841419b90e1d6813d9bcefbcb91554a63':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 20:33:46 +0000 (13:33 -0700)]
am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 20:33:35 +0000 (13:33 -0700)]
am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
e874bd351f7b68cead889f55afba505fb5fac97c':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:33:30 +0000 (13:33 -0700)]
am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
bbc9a62a71dd35c30eed96db9d4e23a754b55d8d':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:33:19 +0000 (13:33 -0700)]
am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
e3badc10112b76db583736767849b2f82ae737fd':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:33:17 +0000 (13:33 -0700)]
am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
bf8be2eefb1f5172582f688cbc090ec04d6908f1':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:33:05 +0000 (13:33 -0700)]
am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:32:48 +0000 (13:32 -0700)]
am
ba8a5413: Fix missing lock in power manager.
* commit '
ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:32:40 +0000 (13:32 -0700)]
am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
7c6be10d314413bb7afbed41017343320319915d':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:05:12 +0000 (13:05 -0700)]
am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
658374d56577a4f8864ba3c7ed8f2e425d13d997':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 20:02:24 +0000 (13:02 -0700)]
am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
2685febd0d51bac4da755756b5348eb95c57ef73':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 19:59:11 +0000 (12:59 -0700)]
am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 19:55:47 +0000 (19:55 +0000)]
Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
Eric Laurent [Fri, 19 Jul 2013 19:50:31 +0000 (19:50 +0000)]
Merge "VolumePreference: fix audio sample playback"
Amith Yamasani [Fri, 19 Jul 2013 19:48:21 +0000 (19:48 +0000)]
Merge "Have UserManagerService clear the restrictions and unblock apps"
Eric Laurent [Fri, 12 Apr 2013 23:29:40 +0000 (16:29 -0700)]
VolumePreference: fix audio sample playback
Handle audio sample start/stop request in a handler
to avoid race conditions.
If a sample is active, do not ignore playback requests but
schedule a second attempt one second later. This is to avoid
ignoring a playback request if a sample is short or about to finish.
Bug:
8176776.
Change-Id: If2d5f7d469eba345af3f4771067a076a56f4bfed
Igor Murashkin [Fri, 19 Jul 2013 19:16:06 +0000 (19:16 +0000)]
Merge "camera2 api: Output classes for key types where it makes sense"
Joe Fernandez [Mon, 15 Jul 2013 19:35:05 +0000 (12:35 -0700)]
docs: Android SDK 22.0.4 Release Notes
Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0
Craig Mautner [Fri, 19 Jul 2013 18:01:05 +0000 (11:01 -0700)]
Access sparse array in correct manner
Was using get() for iteration. Consequence of cl 331550.
Fixes bug
9902476.
Change-Id: I4ec08d0421411981db8b8fba7342e9a3db606ce1
Mike Lockwood [Fri, 19 Jul 2013 17:38:17 +0000 (17:38 +0000)]
Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET"
Baligh Uddin [Fri, 19 Jul 2013 17:16:41 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Wink Saville [Fri, 19 Jul 2013 17:12:39 +0000 (17:12 +0000)]
Merge "checkMobileProvisioning is not using sendNotification."
Baligh Uddin [Fri, 19 Jul 2013 17:12:17 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Robert Greenwalt [Fri, 19 Jul 2013 17:10:38 +0000 (17:10 +0000)]
Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
Wink Saville [Fri, 19 Jul 2013 16:27:56 +0000 (09:27 -0700)]
checkMobileProvisioning is not using sendNotification.
Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c
Ben Murdoch [Wed, 17 Jul 2013 15:25:07 +0000 (16:25 +0100)]
Add WebView.evaluateJavaScript(String, ValueCallback) API.
This API is intended to replace the "WebView.loadUrl("javascript:...")
pattern that is the current mechanism for executing JavaScript in the
context of the current page displayed in the WebView.
The new API is more convenient - it doesn't trigger the normal URL
loading path - and so does not have side effects such as hiding
the keyboard - and allows the caller to specify a callback that will
be invoked once the script execution is complete.
BUG=
9814043
Change-Id: I3f27e8ff5371077d9265430090d61381a3a86e76
Satoshi Kataoka [Fri, 19 Jul 2013 03:26:52 +0000 (03:26 +0000)]
Merge "Fix an issue on hardcoded alarm settings intent"
Kenny Root [Fri, 19 Jul 2013 01:43:39 +0000 (01:43 +0000)]
Merge "KeySets: better rejection for badly-formed manifest"
Christopher Tate [Fri, 19 Jul 2013 01:23:57 +0000 (18:23 -0700)]
Fix build & preserve DHCP scheduling as-is
Change-Id: I4063b18532c476280f343658bf3641495e526ed4
Christopher Tate [Fri, 19 Jul 2013 00:54:37 +0000 (00:54 +0000)]
Merge "Twilight alarms are now non-wakeup but exact"
Christopher Tate [Fri, 19 Jul 2013 00:52:44 +0000 (17:52 -0700)]
Twilight alarms are now non-wakeup but exact
Change-Id: Iccb15065d7a0483f0bc2aff0238b94e946b8cbf1
Dianne Hackborn [Fri, 19 Jul 2013 00:46:40 +0000 (00:46 +0000)]
Merge "Fix issue #
9925269: Naver app crashes on launch"
Christopher Tate [Fri, 19 Jul 2013 00:42:38 +0000 (00:42 +0000)]
Merge "Make more calendar alarms exact"
Christopher Tate [Fri, 19 Jul 2013 00:41:32 +0000 (17:41 -0700)]
Make more calendar alarms exact
Change-Id: I5ef72268b0605ba5a635b70d2b521533d3bd3ef0
Colin Cross [Fri, 19 Jul 2013 00:35:05 +0000 (00:35 +0000)]
Merge "Use virtual screen size to determine lowmemorykiller tuning"
Colin Cross [Fri, 19 Jul 2013 00:35:01 +0000 (00:35 +0000)]
Merge "Add properties to override size and density"
Dianne Hackborn [Fri, 19 Jul 2013 00:31:13 +0000 (17:31 -0700)]
Fix issue #
9925269: Naver app crashes on launch
No comment.
Change-Id: I084cbbf21cacdce179c11528b7217fdc6006dceb
Christopher Tate [Fri, 19 Jul 2013 00:22:59 +0000 (00:22 +0000)]
Merge "Batch alarms to reduce device wakeups"
Colin Cross [Fri, 19 Jul 2013 00:15:15 +0000 (17:15 -0700)]
Use virtual screen size to determine lowmemorykiller tuning
Use the virtual screen resolution returned by getBaseDisplaySize
instead of the physical screen resolution returned by
getInitialDisplaySize. The memory required by apps will scale
with graphics buffer size, which are generally relative to the
virtual screen resolution.
Change-Id: I0476e4afad99eca2f4f56042a8dbef5b3c7889db
Colin Cross [Fri, 19 Jul 2013 00:09:56 +0000 (17:09 -0700)]
Add properties to override size and density
Add properties ro.config.density_override and ro.config.size_override
to provide build-time virtual screen sizes. A device with no
override set with "wm size" will use the size specified by the property.
"wm size reset" will go back to the physical size.
Change-Id: I07a585eb2e0f91365fac2b64c53de3af138a2a85
Dianne Hackborn [Thu, 18 Jul 2013 23:53:33 +0000 (23:53 +0000)]
Merge "Fix crash."
Dianne Hackborn [Thu, 18 Jul 2013 23:51:04 +0000 (16:51 -0700)]
Fix crash.
Change-Id: I0b5d846d5a9e6b1c7c3756b653833c263634270b
Igor Murashkin [Thu, 18 Jul 2013 02:15:57 +0000 (19:15 -0700)]
camera2 api: Output classes for key types where it makes sense
Change-Id: I0f74c110cc4917bfd96d812ee98c385bb1b937b7
Jeff Brown [Thu, 18 Jul 2013 23:38:40 +0000 (23:38 +0000)]
Merge "Fix build."
Jeff Brown [Thu, 18 Jul 2013 23:37:44 +0000 (16:37 -0700)]
Fix build.
Change-Id: Ie83f51ab4b8fddceda8d4f0ac24c532eab7458b8
Zhijun He [Thu, 18 Jul 2013 23:20:47 +0000 (23:20 +0000)]
Merge "Update camera metedata"
Amith Yamasani [Tue, 2 Jul 2013 18:17:30 +0000 (11:17 -0700)]
Have UserManagerService clear the restrictions and unblock apps
Since this is an operation that could take a few seconds to run and needs to be
completed even if Settings dies, best to do it in the user manager.
Refactored PIN challenge/setup UI with a field to verify existing pin
when changing to a new one.
Change-Id: I0b7df5b2ccb7f343aa9282a9245d3bc2b577a794
Scott Main [Thu, 18 Jul 2013 23:10:37 +0000 (16:10 -0700)]
remove significant motion
Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b
Dianne Hackborn [Thu, 18 Jul 2013 22:56:04 +0000 (22:56 +0000)]
Merge "Fix issue #
9913990: Background processes are being added to..."
Chris Craik [Thu, 18 Jul 2013 22:55:44 +0000 (22:55 +0000)]
Merge "Add reconfigure method to Bitmap"
Scott Main [Thu, 18 Jul 2013 22:46:11 +0000 (22:46 +0000)]
Merge "more details about account access in restricted profiles" into jb-mr2-dev
Dianne Hackborn [Thu, 18 Jul 2013 22:39:51 +0000 (15:39 -0700)]
Fix issue #
9913990: Background processes are being added to...
...the *end* of the process LRU listB
Change-Id: I75c9477b81e10c4e517fd836304467fb3f7ed85e
Scott Main [Thu, 18 Jul 2013 22:22:16 +0000 (15:22 -0700)]
am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
991487c635ea0cd9ccfaae8e030325c2e8be7a3f':
fix typo in code sample
Scott Main [Thu, 18 Jul 2013 22:19:39 +0000 (15:19 -0700)]
am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
9a1f106d9ef33a3ea22d7b34d736586d4fae0447':
fix typo in code sample
Zhijun He [Wed, 17 Jul 2013 19:08:24 +0000 (12:08 -0700)]
Update camera metedata
Change-Id: Ib33da76659c7aa5364ec2c3abc3613cf23eb7c36
Scott Main [Thu, 18 Jul 2013 22:16:46 +0000 (15:16 -0700)]
am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
34a1fa43899dc2b0b2f249262b69c922949ab626':
fix typo in code sample
Scott Main [Thu, 18 Jul 2013 22:13:55 +0000 (22:13 +0000)]
Merge "fix typo in code sample" into jb-mr1.1-ub-dev
Jeff Brown [Thu, 18 Jul 2013 22:13:26 +0000 (22:13 +0000)]
Merge "Split framework jar."
Scott Main [Thu, 18 Jul 2013 22:09:03 +0000 (15:09 -0700)]
more details about account access in restricted profiles
Change-Id: I2710c3e8736748ca3080ee88f076255a6639b1e3
Alan Viverette [Thu, 18 Jul 2013 22:06:21 +0000 (22:06 +0000)]
Merge "Set transient state for focus container in ListView"
Robert Greenwalt [Thu, 18 Jul 2013 21:24:42 +0000 (14:24 -0700)]
Make CS.isTetheringSupported dynamic
It used to be set at boot, but that was too quick to pick up carrier
specific resources. With this change even if you switch sims subequent
checks get the new values.
bug:
9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d
Eino-Ville Talvala [Thu, 18 Jul 2013 18:51:33 +0000 (18:51 +0000)]
Merge "Camera: Remove camera gid from apps with camera permission."
Baligh Uddin [Thu, 18 Jul 2013 18:45:05 +0000 (11:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a868474b1fa886a461c5f5d81126aabc8d98bef
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 18:30:15 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93223b932aad3c6331d2da2acf27c5085af00028
Auto-generated-cl: translation import
Justin Koh [Thu, 18 Jul 2013 18:27:50 +0000 (18:27 +0000)]
Merge "Add FX_KEYPRESS_INVALID constant to AudioManager."
Dianne Hackborn [Thu, 18 Jul 2013 18:23:09 +0000 (18:23 +0000)]
Merge "Switch Bundle's implementation over to ArrayMap."
Dianne Hackborn [Thu, 18 Jul 2013 18:22:40 +0000 (18:22 +0000)]
Merge "Mmmmmmm... lovely, lovely ArrayMap."
Dianne Hackborn [Thu, 18 Jul 2013 01:43:12 +0000 (18:43 -0700)]
Mmmmmmm... lovely, lovely ArrayMap.
And ArraySet, too.
Change-Id: I72ea28cbb2286b01b6e1be082f8e7ec17e99074e
Dianne Hackborn [Thu, 18 Jul 2013 18:12:50 +0000 (18:12 +0000)]
Merge "Make it safe to use start/stop app ops outside of system proc"