OSDN Git Service
Jim Miller [Wed, 19 Sep 2012 12:50:33 +0000 (05:50 -0700)]
am
5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
* commit '
5d8d169bbb0325665d600415bc7b4add2dbcaf75':
Fix wrong pattern count in keyguard pattern security view.
Amith Yamasani [Wed, 19 Sep 2012 12:50:07 +0000 (05:50 -0700)]
am
4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev
* commit '
4adb9d34162b109db3c67e352ad50c76dc7f2d45':
DevicePolicyManager per user
Jim Miller [Wed, 19 Sep 2012 04:06:41 +0000 (21:06 -0700)]
Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
Jim Miller [Wed, 19 Sep 2012 03:52:55 +0000 (20:52 -0700)]
Fix wrong pattern count in keyguard pattern security view.
This fixes a bug introduced in I085c5ec8 where keyguard attempts to emulate
slippery windows with views. In order to do so, the code was overloading
dispatchTouchEvent(). It would allow the super (a ViewGroup) to dispatch
the events and then would dispatch them itself to sub views. In the case
where an event overlaps an actual child view, it would result in 2 copies of the event
per window layer (there are 2). This results in 2 events per layer for the
top two views in the hierarchy. So each actual pattern attempt would count as 4
attempts to the system.
The solution is to overload onTouchEvent() at each level in the view hierarchy,
which means that we ignore events that were already handled by a child window
of the parent.
This change also disables slippery windows for keyguard because it causes
vertical patterns to be ignored.
Fixes bug
7191277
Change-Id: I4df217f2bf382134d93113b8d55b0d71e0e23677
Amith Yamasani [Wed, 19 Sep 2012 03:00:44 +0000 (20:00 -0700)]
Merge "DevicePolicyManager per user" into jb-mr1-dev
Jason Sams [Wed, 19 Sep 2012 02:13:35 +0000 (19:13 -0700)]
am
2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
* commit '
2d95a33dc3a463b197d4597b38f5ae124de25017':
Fix build. Missed current.txt in previous checkin.
Jason Sams [Wed, 19 Sep 2012 02:11:17 +0000 (19:11 -0700)]
Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
Jason Sams [Wed, 19 Sep 2012 02:10:34 +0000 (19:10 -0700)]
Fix build. Missed current.txt in previous checkin.
Change-Id: I458944fbd9b04526068d03330620ad4805b5c993
Romain Guy [Wed, 19 Sep 2012 02:03:36 +0000 (19:03 -0700)]
am
4e54f930: Merge "Add test for layer updates optimizations" into jb-mr1-dev
* commit '
4e54f930d4dcd297f45507883b9404e1a5ef703b':
Add test for layer updates optimizations
Romain Guy [Wed, 19 Sep 2012 02:01:25 +0000 (19:01 -0700)]
Merge "Add test for layer updates optimizations" into jb-mr1-dev
Romain Guy [Wed, 19 Sep 2012 01:59:59 +0000 (18:59 -0700)]
Add test for layer updates optimizations
Optimizations are following.
Change-Id: I120e1d0c08d8068fcac46515f37a4ae510e5f3a3
Adam Powell [Wed, 19 Sep 2012 01:52:40 +0000 (18:52 -0700)]
am
2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev
* commit '
2a81fe68c208768ea202cd0353ad4a8212c2b066':
Further tune config_minScalingSpan for small screen devices.
Adam Powell [Wed, 19 Sep 2012 01:49:32 +0000 (18:49 -0700)]
Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev
Jason Sams [Wed, 19 Sep 2012 01:48:53 +0000 (18:48 -0700)]
am
55db6865: Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev
* commit '
55db6865ef708d66fd2382d6e96a845b68030f20':
Clean up and publish the YUV to RGB intrinsic.
Adam Powell [Wed, 19 Sep 2012 01:47:17 +0000 (18:47 -0700)]
am
98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
* commit '
98c370e71d93ed2704018e2bc3455f00c08821a9':
Make invalidateOptionsMenu asynchronous
Jason Sams [Wed, 19 Sep 2012 01:43:09 +0000 (18:43 -0700)]
Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev
Adam Powell [Wed, 19 Sep 2012 01:42:58 +0000 (18:42 -0700)]
Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
Adam Powell [Wed, 19 Sep 2012 01:34:08 +0000 (18:34 -0700)]
Make invalidateOptionsMenu asynchronous
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.
Bug
7189372
Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
Dianne Hackborn [Wed, 19 Sep 2012 01:30:08 +0000 (18:30 -0700)]
am
1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev
* commit '
1e5aeecb64827d2b71f429d73a05c25ffe4a5be8':
Don't allow more than 3 actively running users at a time.
Jason Sams [Wed, 19 Sep 2012 01:23:15 +0000 (18:23 -0700)]
Clean up and publish the YUV to RGB intrinsic.
Change-Id: Iffb346a5d751f0bae123455869bda8db37d542ff
Dianne Hackborn [Wed, 19 Sep 2012 01:22:15 +0000 (18:22 -0700)]
Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 22:48:21 +0000 (15:48 -0700)]
Don't allow more than 3 actively running users at a time.
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
Andy Stadler [Wed, 19 Sep 2012 00:54:36 +0000 (17:54 -0700)]
am
6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
* commit '
6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
Move X509TrustManagerExtensions to correct directory
Andy Stadler [Wed, 19 Sep 2012 00:51:09 +0000 (17:51 -0700)]
Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
Andy Stadler [Wed, 19 Sep 2012 00:40:14 +0000 (17:40 -0700)]
Move X509TrustManagerExtensions to correct directory
Also removed unused imports.
Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
Mike Lockwood [Wed, 19 Sep 2012 00:15:35 +0000 (17:15 -0700)]
am
954a5d61: Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev
* commit '
954a5d61a2b66a64a841669f75e1cbd9103029b5':
AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
Mike Lockwood [Wed, 19 Sep 2012 00:12:37 +0000 (17:12 -0700)]
Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev
Romain Guy [Wed, 19 Sep 2012 00:06:03 +0000 (17:06 -0700)]
am
24755d2b: Merge "mutate() didn\'t work as advertised Bug #
7162705" into jb-mr1-dev
* commit '
24755d2b4248c2aa678e08a4703e8e97fd2e7dd1':
mutate() didn't work as advertised Bug #
7162705
Jim Miller [Wed, 19 Sep 2012 00:04:13 +0000 (17:04 -0700)]
am
402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev
* commit '
402f0c81230304379d7c4108745f928b34e052fa':
Refactor Carrier text as a movable module.
Romain Guy [Wed, 19 Sep 2012 00:03:04 +0000 (17:03 -0700)]
Merge "mutate() didn't work as advertised Bug #
7162705" into jb-mr1-dev
Jim Miller [Wed, 19 Sep 2012 00:00:37 +0000 (17:00 -0700)]
Merge "Refactor Carrier text as a movable module." into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 23:56:11 +0000 (16:56 -0700)]
mutate() didn't work as advertised
Bug #
7162705
Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
Romain Guy [Tue, 18 Sep 2012 22:54:59 +0000 (15:54 -0700)]
am
ceb5a981: Merge "Minimize state changes when updating layers" into jb-mr1-dev
* commit '
ceb5a981296e57a5fb1be60f7b030c4d6c7e0acb':
Minimize state changes when updating layers
Fabrice Di Meglio [Tue, 18 Sep 2012 22:54:55 +0000 (15:54 -0700)]
am
9ffc6047: Merge "Fix bug #
7173155 API REVIEW: android.view.View" into jb-mr1-dev
* commit '
9ffc6047f14883f853b643a2913bd590995b9031':
Fix bug #
7173155 API REVIEW: android.view.View
Romain Guy [Tue, 18 Sep 2012 22:54:51 +0000 (15:54 -0700)]
am
29d0aa73: Merge "Compute GradientDrawable\'s opacity correctly" into jb-mr1-dev
* commit '
29d0aa73a099fde05c506857b5d215cde87b78d6':
Compute GradientDrawable's opacity correctly
Geremy Condra [Tue, 18 Sep 2012 22:54:47 +0000 (15:54 -0700)]
am
ad793427: Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev
* commit '
ad79342786f989a9b478be52b1a06272c28574ec':
Code cleanup for X509TrustManagerExtensionsTest.java
Winson Chung [Tue, 18 Sep 2012 22:54:42 +0000 (15:54 -0700)]
am
688ca470: Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug
7188166)" into jb-mr1-dev
* commit '
688ca4708bad4a7c829758449664f08be48fa246':
Fixing crash in emulator due to no BluetoothAdapter. (Bug
7188166)
Jim Miller [Tue, 18 Sep 2012 22:54:38 +0000 (15:54 -0700)]
am
6eac514a: Merge "Remove trailing period from missing SIM string" into jb-mr1-dev
* commit '
6eac514a026d303bfdec34f9314debc58c3809b8':
Remove trailing period from missing SIM string
Jim Miller [Tue, 18 Sep 2012 22:54:35 +0000 (15:54 -0700)]
am
772db427: Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev
* commit '
772db427a79fc1e81cb54f8ebead5e22edb0162d':
Selectively enable back button in keyguard for security screens.
Romain Guy [Tue, 18 Sep 2012 22:43:04 +0000 (15:43 -0700)]
Merge "Minimize state changes when updating layers" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 22:42:34 +0000 (15:42 -0700)]
Merge "Fix bug #
7173155 API REVIEW: android.view.View" into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 22:40:58 +0000 (15:40 -0700)]
Minimize state changes when updating layers
Change-Id: I407fcc80bd3178f9f09a3b379ceb7f7ce0749e08
Romain Guy [Tue, 18 Sep 2012 22:39:29 +0000 (15:39 -0700)]
Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 22:37:24 +0000 (15:37 -0700)]
Compute GradientDrawable's opacity correctly
The current implementation of GradientDrawable always assumes the shape needs
to be blended. This causes all windows to be considered translucent by default.
This change recomputes the opacity as needed to ensure windows are marked
opaque when they should.
Change-Id: Iaf291d889a6c5122ab00c9f5781df3e7f61547fa
Geremy Condra [Tue, 18 Sep 2012 22:37:21 +0000 (15:37 -0700)]
Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev
Winson Chung [Tue, 18 Sep 2012 22:34:37 +0000 (15:34 -0700)]
Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug
7188166)" into jb-mr1-dev
Jim Miller [Tue, 18 Sep 2012 22:33:49 +0000 (15:33 -0700)]
Merge "Remove trailing period from missing SIM string" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 22:33:07 +0000 (15:33 -0700)]
Fix bug #
7173155 API REVIEW: android.view.View
- remove getFocusRect(Rect) as it was redundant
- fix Javadoc
Change-Id: I3784c4b0a38770cba5d3ba09196f9271050a3c20
Jim Miller [Tue, 18 Sep 2012 22:32:04 +0000 (15:32 -0700)]
Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev
Irfan Sheriff [Tue, 18 Sep 2012 22:28:47 +0000 (15:28 -0700)]
am
7d0882be: Merge "send connection broadcast on client disconnect" into jb-mr1-dev
* commit '
7d0882be6d7e2a434072cb0bb63cb117e73491cb':
send connection broadcast on client disconnect
Irfan Sheriff [Tue, 18 Sep 2012 22:26:15 +0000 (15:26 -0700)]
Merge "send connection broadcast on client disconnect" into jb-mr1-dev
Irfan Sheriff [Tue, 18 Sep 2012 19:39:22 +0000 (12:39 -0700)]
send connection broadcast on client disconnect
Bug:
7188646
Change-Id: I69f2c2581004b08730407930fb056cc1fe54feec
Jeff Sharkey [Tue, 18 Sep 2012 22:00:33 +0000 (15:00 -0700)]
am
6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev
* commit '
6281d7cf32bdc624a9d70b2b4f5abce342558c27':
Multi-user MTP.
Fabrice Di Meglio [Tue, 18 Sep 2012 22:00:25 +0000 (15:00 -0700)]
am
8b3560d3: Merge "Fix bug #
7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev
* commit '
8b3560d3e68d6e596bc22b117b049e15cc7e1b3b':
Fix bug #
7172972 API REVIEW: android.graphics.drawable.Drawable
Fabrice Di Meglio [Tue, 18 Sep 2012 22:00:14 +0000 (15:00 -0700)]
am
20586fa0: Merge "Fix bug #
7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev
* commit '
20586fa0353f63453766140b32a4778793ce2b43':
Fix bug #
7173351 API REVIEW: android.util.LocaleUtil
Adam Cohen [Tue, 18 Sep 2012 22:00:09 +0000 (15:00 -0700)]
am
642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev
* commit '
642258a29b426b14da509df3a5ed912673feeb57':
Tweaking how settings adds keyguard widgets
Fabrice Di Meglio [Tue, 18 Sep 2012 21:59:59 +0000 (14:59 -0700)]
Jamie Gennis [Tue, 18 Sep 2012 21:59:38 +0000 (14:59 -0700)]
am
94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev
* commit '
94998c9c4e19d5b439228646f1b283201367b7a0':
SurfaceTexture: remove call to doGLFenceWait
Andy Stadler [Tue, 18 Sep 2012 21:59:34 +0000 (14:59 -0700)]
am
ab3d0fd6: (-s ours) Merge "Move files to make eclipse-java happy" into jb-mr1-dev
* commit '
ab3d0fd684eabecd6b290ef3cb9799739db04ca3':
Move files to make eclipse-java happy
Mike Lockwood [Tue, 18 Sep 2012 18:16:57 +0000 (11:16 -0700)]
AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
Bug:
7051259
Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51
Signed-off-by: Mike Lockwood <lockwood@google.com>
Jeff Sharkey [Tue, 18 Sep 2012 21:52:46 +0000 (14:52 -0700)]
Merge "Multi-user MTP." into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 21:49:10 +0000 (14:49 -0700)]
Merge "Fix bug #
7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev
Chet Haase [Tue, 18 Sep 2012 21:49:55 +0000 (14:49 -0700)]
am
48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev
* commit '
48618c987eed656bf3d8baa6ce25b7f5d3f4a43e':
Fix GL shader bugs
Fabrice Di Meglio [Tue, 18 Sep 2012 21:47:52 +0000 (14:47 -0700)]
Merge "Fix bug #
7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev
Adam Cohen [Tue, 18 Sep 2012 21:47:06 +0000 (14:47 -0700)]
Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev
Winson Chung [Tue, 18 Sep 2012 20:11:37 +0000 (13:11 -0700)]
Fixing crash in emulator due to no BluetoothAdapter. (Bug
7188166)
Change-Id: I63fe4b229a8a460170df153e71b7ad65655dfad1
Fabrice Di Meglio [Tue, 18 Sep 2012 21:46:59 +0000 (14:46 -0700)]
Merge "Fix bug #
7172699" into jb-mr1-dev
Adam Powell [Tue, 18 Sep 2012 21:46:56 +0000 (14:46 -0700)]
Further tune config_minScalingSpan for small screen devices.
Bug
7189429
Change-Id: Ia031551d2e1cd2569d21ce4901b454866c4d88c3
Geremy Condra [Tue, 18 Sep 2012 21:41:39 +0000 (14:41 -0700)]
Code cleanup for X509TrustManagerExtensionsTest.java
Change-Id: I85584f7a9dbc726be811f783d125efcf70c9f6af
Adam Cohen [Tue, 18 Sep 2012 20:39:42 +0000 (13:39 -0700)]
Tweaking how settings adds keyguard widgets
-> Fix for issue
7173587
-> Fix for issue
7173877
Change-Id: I60cd3952113335df60292f67461d50f6c8bd2ed3
Jamie Gennis [Tue, 18 Sep 2012 21:32:00 +0000 (14:32 -0700)]
Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev
Amith Yamasani [Sat, 15 Sep 2012 06:20:08 +0000 (23:20 -0700)]
DevicePolicyManager per user
Bug:
7136483
Store device policy information for each user and apply them when user switches.
Global proxy can only be controlled by owner.
Camera restriction applies to all users, if any one has an admin that disables it.
Storage encryption can only be controlled by owner, although other users can query the state.
Wipe data will only remove the user if non-zero, wipe the device, if zero.
Change-Id: I359be46c1bc3828fd13d4be3228f11495081c8f2
Andy Stadler [Tue, 18 Sep 2012 21:20:30 +0000 (14:20 -0700)]
Merge "Move files to make eclipse-java happy" into jb-mr1-dev
Chet Haase [Tue, 18 Sep 2012 21:13:57 +0000 (14:13 -0700)]
Merge "Fix GL shader bugs" into jb-mr1-dev
Chet Haase [Tue, 18 Sep 2012 00:43:45 +0000 (17:43 -0700)]
Fix GL shader bugs
Fixing errors in emitted shader code that caused GL errors
at runtime
Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
Andy Stadler [Tue, 18 Sep 2012 21:08:30 +0000 (14:08 -0700)]
Move files to make eclipse-java happy
No changes to text at all, just moving the java files to match their
declared packages.
There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449
Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
Geremy Condra [Tue, 18 Sep 2012 21:04:14 +0000 (14:04 -0700)]
am
cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev
* commit '
cdf964eab3cb9381745886f35b8c5a73ba61e28d':
Fix bad isinstance check in X509TrustManagerExtensions and add test.
Christopher Tate [Tue, 18 Sep 2012 21:04:10 +0000 (14:04 -0700)]
am
6b58fde9: Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev
* commit '
6b58fde99a2c78e4ef66679dd62eb29848e9a9f7':
Settings provider needs to send notifications as itself
Daniel Sandler [Tue, 18 Sep 2012 21:04:04 +0000 (14:04 -0700)]
am
63bcc14c: Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev
* commit '
63bcc14c433b754c234bb593e6fdeaf08db1b106':
Remove settings and rotation buttons from notification panel.
Jason Sams [Tue, 18 Sep 2012 21:03:48 +0000 (14:03 -0700)]
am
a2163607: Merge "Add Kernel, Method, and field IDs bug
7182873" into jb-mr1-dev
* commit '
a21636074aee3a4291ba3bb7b0eb038dfeccfbb5':
Add Kernel, Method, and field IDs bug
7182873
Irfan Sheriff [Tue, 18 Sep 2012 21:03:36 +0000 (14:03 -0700)]
am
24ed2769: Merge "WFD fixes" into jb-mr1-dev
* commit '
24ed2769130a8f9df44e7fc22be52b6282e724c3':
WFD fixes
Geremy Condra [Tue, 18 Sep 2012 20:47:17 +0000 (13:47 -0700)]
Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev
Geremy Condra [Tue, 18 Sep 2012 20:35:29 +0000 (13:35 -0700)]
Fix bad isinstance check in X509TrustManagerExtensions and add test.
Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
Fabrice Di Meglio [Tue, 18 Sep 2012 20:38:53 +0000 (13:38 -0700)]
Fix bug #
7172972 API REVIEW: android.graphics.drawable.Drawable
- add @hide
Change-Id: I20dca8d7f6a58dfd1dd342135dcff912e08d4ab9
Christopher Tate [Tue, 18 Sep 2012 20:35:59 +0000 (13:35 -0700)]
Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev
Daniel Sandler [Tue, 18 Sep 2012 20:33:20 +0000 (13:33 -0700)]
Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev
Christopher Tate [Tue, 18 Sep 2012 20:27:36 +0000 (13:27 -0700)]
Settings provider needs to send notifications as itself
... and not as its ultimate caller, who may be a less-privileged
application. Fixes bug
7188309
Change-Id: Iffd37b8da84f683bf665bf3d48c0b7fbc8dd721d
Jeff Sharkey [Sun, 16 Sep 2012 19:49:00 +0000 (12:49 -0700)]
Multi-user MTP.
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.
To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.
This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().
Bug:
6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
Jason Sams [Tue, 18 Sep 2012 20:24:55 +0000 (13:24 -0700)]
Merge "Add Kernel, Method, and field IDs bug
7182873" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 19:55:32 +0000 (12:55 -0700)]
Fix bug #
7173351 API REVIEW: android.util.LocaleUtil
Change-Id: I08fd491eff714059e9ec874fadebe7eb556c34d5
Jason Sams [Tue, 18 Sep 2012 19:32:10 +0000 (12:32 -0700)]
Add Kernel, Method, and field IDs
bug
7182873
Change-Id: I066a359bb04027e9376dac088560f042c496b10e
Irfan Sheriff [Tue, 18 Sep 2012 19:22:06 +0000 (12:22 -0700)]
Merge "WFD fixes" into jb-mr1-dev
Irfan Sheriff [Tue, 18 Sep 2012 19:05:31 +0000 (12:05 -0700)]
WFD fixes
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast
Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
Geremy Condra [Tue, 18 Sep 2012 19:16:51 +0000 (12:16 -0700)]
am
00bc4c0b: Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev
* commit '
00bc4c0b6723bda12e846f9f1f729acb79a389a1':
Initial commit for X509TrustManagerExtensions.
Mike Lockwood [Tue, 18 Sep 2012 19:16:21 +0000 (12:16 -0700)]
am
465d7207: am
ad23333f: am
945080b5: am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
465d72073c6d47a27b51d384bd9e019faa7957c1':
MtpData bmp format file can't recognize when copy bmp into DUT
Fabrice Di Meglio [Tue, 18 Sep 2012 19:06:13 +0000 (12:06 -0700)]
Fix bug #
7172699
- remove @link as we are already using a @see which is doing a link by itself
Change-Id: I6ff6979bb2d960c3c980cdf0a88885b92e80fd7f
Geremy Condra [Tue, 18 Sep 2012 18:39:13 +0000 (11:39 -0700)]
Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev
Geremy Condra [Sat, 15 Sep 2012 01:11:29 +0000 (18:11 -0700)]
Initial commit for X509TrustManagerExtensions.
This provides a mechanism for exposing the bells
and whistles we've attached to trust managers to
third parties.
Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
Scott Main [Tue, 18 Sep 2012 18:04:19 +0000 (11:04 -0700)]
am
c95b1d88: am
a59b1dac: am
edf0ba6e: am
44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
* commit '
c95b1d88477f5cd3abd6481e73a4185417e4a0bd':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 18:04:15 +0000 (11:04 -0700)]
am
0f38c088: am
3ce6b008: am
d67459ff: new Google Play badges and some updates to corresponding pages
* commit '
0f38c0887cf92e1dd57e8149b2ca5ef8f586e947':
new Google Play badges and some updates to corresponding pages