Fabrice Di Meglio
c39d3d32ab
Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog""
2014-02-19 01:14:46 +00:00
Fabrice Di Meglio
494440be14
Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
...
This reverts commit 08189afdb02af22991184bddba74d5402ea7720f.
Change-Id: Ie8797daca642685ee9a2a541d11a35daa28f0564
2014-02-19 01:11:21 +00:00
Sailesh Nepal
f86a9221a4
Delete Third Party Call APIs
...
Change-Id: I6121c53362804a228e0316a1666b5032817530ab
2014-02-18 17:04:10 -08:00
Chris Craik
e9b8817bd7
Make outline and shadow APIs public
...
Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
2014-02-18 16:55:45 -08:00
Jay Shrauner
ae58624157
Merge "Prevent SpellChecker from setting invalid range"
2014-02-19 00:24:39 +00:00
Marco Nelissen
940591d92e
Merge "Fix regression"
2014-02-19 00:10:19 +00:00
ztenghui
146a1f0cbc
Merge "Separate spot and ambient shadow strength setting"
2014-02-19 00:07:28 +00:00
Marco Nelissen
d5a579765e
Fix regression
...
Don't crash if an item is inserted without a slash in its path.
b/13076381
Change-Id: I5cde2adaa038201e0692af3c8ca92540ce75f083
2014-02-18 16:06:38 -08:00
Craig Mautner
060f509f20
am 74304f89: (-s ours) am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
...
* commit '74304f890e7341d9bb8a6fdadd9e5f4dda60a246':
Allow "opaque" flag to be updated. DO NOT MERGE
2014-02-19 00:05:50 +00:00
Craig Mautner
74304f890e
am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
...
* commit '1bf3795798aa462187a8c83220f900f293dfc1ee':
Allow "opaque" flag to be updated. DO NOT MERGE
2014-02-19 00:02:16 +00:00
Craig Mautner
1bf3795798
am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
...
* commit 'db0f3e825fb4da01f887c41a877708734b0899e3':
Allow "opaque" flag to be updated. DO NOT MERGE
2014-02-18 23:59:42 +00:00
Craig Mautner
db0f3e825f
Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
2014-02-18 23:56:53 +00:00
Andy McFadden
4f0a80d0b8
Allow "opaque" flag to be updated. DO NOT MERGE
...
Added a setOpaque() call and a bunch of comments.
Bug 12387406
Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
2014-02-18 15:54:24 -08:00
Adam Lesinski
f5b3a01e54
Add fastpath for single signature comparison
...
PackageManager does not need to create a hash set
when comparing two sets of signatures, where each set
contains one signature. This is the common case for
most applications.
Bug:13029313
Change-Id: I61883d85960db7b376e234d7abae6149c4d20245
2014-02-18 15:31:41 -08:00
Adam Lesinski
5441745eff
am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup
...
* commit '019b1f2668ac17f5e52b6ce32a524d26134a062a':
Create FEATURE_ constants for print and backup
2014-02-18 23:03:37 +00:00
Adam Lesinski
019b1f2668
am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup
...
* commit '2ea983a567bf536f71dd620e1b215d5aeebce531':
Create FEATURE_ constants for print and backup
2014-02-18 23:01:06 +00:00
Adam Lesinski
2ea983a567
am 3d9bcb90: Create FEATURE_ constants for print and backup
...
* commit '3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
Create FEATURE_ constants for print and backup
2014-02-18 22:57:37 +00:00
Adam Lesinski
2cb6c60c0d
Make UsbService optional
...
Tweaked the services Android.mk to build dependencies
when building with mm[m].
Change-Id: I6dad511c652bcacc085f27ede5f8f22a6982c6bd
2014-02-18 14:57:09 -08:00
Dianne Hackborn
93b55c1149
Merge "Implement wifi part of issue #12973036 : Improve power_profile.xml"
2014-02-18 22:45:17 +00:00
Dianne Hackborn
ca1bf21c51
Implement wifi part of issue #12973036 : Improve power_profile.xml
...
Add battery stats tracking of wifi state.
Also update when we retrieve the current time to use a more
consistent value across stats tracking.
Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
2014-02-18 14:43:14 -08:00
Deepanshu Gupta
f22d01e850
Merge "Fix native methods"
2014-02-18 22:41:14 +00:00
Jeff Sharkey
5b12ed5746
Merge "Lock down MANAGE_DOCUMENTS permission."
2014-02-18 22:40:41 +00:00
Dan Sandler
5d7c3cc66c
Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
...
$ adb shell settings put global lock_screen_show_notifications 1
Previously a per-user secure setting
(Settings.Secure.LOCK_SCREEN_ALLOW_NOTIFICATIONS), but this
doesn't really make a lot of sense since this behavior
pertains to areas of the system (keyguard, status bar) that
exist outside of any one user.
This setting now effectively enables notifications on the
secure lockscreen for all users.
Change-Id: I9c5179498dbbba9343184efdedb1587ea862cf96
2014-02-18 17:35:15 -05:00
Adam Lesinski
3d9bcb90ee
Create FEATURE_ constants for print and backup
...
Bug:13079822
Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
2014-02-18 14:33:00 -08:00
Dan Sandler
2b330dde2c
Merge "Allow a user to elect to see private notifications in public."
2014-02-18 22:30:50 +00:00
Jeff Sharkey
89f545a4eb
Lock down MANAGE_DOCUMENTS permission.
...
MANAGE_DOCUMENTS is a very broad permission, since it allows full
access to all DocumentsProviders. DocumentsUI should really be the
only app holding this permission; everyone else should rely on Uri
permission grants for access.
Bug: 12958298
Change-Id: I1def48a4ea1814e031fc8513c3cd051d764cd7f8
2014-02-18 14:26:23 -08:00
Alan Viverette
e082ae6bd6
Merge "Fix sub scroller bounds checking"
2014-02-18 22:08:24 +00:00
Alan Viverette
bb9364279f
Fix sub scroller bounds checking
...
BUG: 13031919
Change-Id: I6b569b50034fbe70441e11e56706faa9f2acfcbd
2014-02-18 14:07:35 -08:00
Deepanshu Gupta
98f33350b1
Fix native methods
...
Fix native method signatures as changed by the following commits:
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334
76d3a1b8d035d27bc80b0f2fc480a903bd001514
Change-Id: I5db31d3665a5e8c84c107cf84ec3bd5ccfb9a9fe
2014-02-18 13:08:07 -08:00
Dan Sandler
fd16d56419
Allow a user to elect to see private notifications in public.
...
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, if
set and nonzero, will show that user's notifications on the
secure lockscreen (assuming LOCK_SCREEN_ALLOW_NOTIFICATIONS
is also set). Note that this applies only to a particular
user's notifications, so if multiple users' notifications
are shown at once (currently this only applies to the
current user and USER_ALL) only that user's notifications
are affected.
USER_ALL is assumed to always allow private notifications in
public (because they can't be user-specific).
Change-Id: I32bb7939066c4919191e74161ca48ead01a88c7f
2014-02-18 15:50:44 -05:00
Ruben Brunk
e60e29554b
camera3: Update whiteLevel tag.
...
Change-Id: If5b5191b1c494bc6f86d36e1dc47dd38beb10f2b
2014-02-18 12:17:48 -08:00
Calin Juravle
8fbcc6b4cd
Fixed a possible infinite loop in JsonReader#skipValue()
...
Bug: https://code.google.com/p/android/issues/detail?id=65846
Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
2014-02-18 19:19:15 +00:00
Zhijun He
0ed25174f9
Merge "Camera2: Update java doc for tone.map.curveRed key"
2014-02-18 19:10:37 +00:00
John Spurlock
ba231fcabf
Fix bad @links in PendingIntent.java
...
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
2014-02-18 13:19:57 -05:00
John Spurlock
60450ddbc6
Merge "Content inset hint should consult PolicyControl."
2014-02-18 18:10:34 +00:00
Jessica Hummel
587f43d872
Merge "Change API for setProfileOwner to require userId"
2014-02-18 17:31:31 +00:00
Jeff Sharkey
e62c4a10cb
am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
...
* commit 'ab5280776f40c473228d3e920771a41289ed7fee':
Structure device not freed in error case
2014-02-18 17:26:17 +00:00
Jeff Sharkey
d3b21393bf
am fef3dd01: am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
...
* commit 'fef3dd01fbad923bf7ff509f4ee95312fd7cb4db':
Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:22:23 +00:00
Jeff Sharkey
9a41b24c8f
am 392ee12f: am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
...
* commit '392ee12fd57870e1e8f0777d03295b0435babd1f':
Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:22:18 +00:00
Jeff Sharkey
ab5280776f
am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
...
* commit '37d894a42b5744e3e5def5fbfcc641fe3afa2063':
Structure device not freed in error case
2014-02-18 17:22:15 +00:00
Jeff Sharkey
37d894a42b
am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
...
* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
Structure device not freed in error case
2014-02-18 17:19:38 +00:00
Jeff Sharkey
fef3dd01fb
am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
...
* commit '41185c844fa7986ff3e5daa4c11288f6bed1463b':
Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:18:12 +00:00
Jeff Sharkey
392ee12fd5
am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
...
* commit '96190f1c054e2e34ac741de1d7afb2f6645d218c':
Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:18:09 +00:00
Jeff Sharkey
660a514e80
am 60097a9c: Merge "Structure device not freed in error case"
...
* commit '60097a9c5a7214cb73d0bc966adef767743f8798':
Structure device not freed in error case
2014-02-18 09:16:31 -08:00
Jeff Sharkey
41185c844f
am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
...
* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:15:44 +00:00
Jeff Sharkey
96190f1c05
am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
...
* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:15:39 +00:00
Jeff Sharkey
df47ecaa09
am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
...
* commit '02a64daefece8ccdc40935c7bc865a8966249c44':
Tethering: Skip link local addresses when enabling NAT
2014-02-18 09:13:00 -08:00
Jeff Sharkey
e6d256c50b
am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
...
* commit '234b0b037ee1f8dc50c846279216a8e4d779ff56':
Fix, MountService now only sends one onShutDownComplete
2014-02-18 09:12:57 -08:00
Jeff Sharkey
60097a9c5a
Merge "Structure device not freed in error case"
2014-02-18 17:12:14 +00:00
Jeff Sharkey
02a64daefe
Merge "Tethering: Skip link local addresses when enabling NAT"
2014-02-18 17:11:10 +00:00