Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,951 Commits 3 Branches 0 Tags
1a285ee293ad7760a0a7c7017f81cad5cdc717ca
Commit Graph

36309 Commits

Author SHA1 Message Date
Jason Monk
1a285ee293 am 6e6d1f21: Merge "Make Lock Task API public." 
* commit '6e6d1f214766bbf00b4b0298d95ec1b42461e470':
  Make Lock Task API public.
 2014-05-07 19:22:38 +00:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00
Jason Monk
a57e5e006b Make Lock Task API public. 
Change-Id: Ieaf944dc69e206e091d8257e0f92013b082ceaac
 2014-05-07 15:15:53 -04:00
Jason Monk
4ef10931b4 am 059637c4: Merge "Make proxy API public" 
* commit '059637c4970bdbed19689a5e9ecb40a9ebe5a739':
  Make proxy API public
 2014-05-07 18:57:01 +00:00
Jason Monk
9d75ccb6a1 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
207900c23b Make proxy API public 
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
 2014-05-07 14:23:53 -04:00
Amith Yamasani
fbad7705ba am 0e5d4e4a: Merge "Fix javadoc typo" 
* commit '0e5d4e4ae4e7c51f383eb1ef2e3941dcdd8096aa':
  Fix javadoc typo
 2014-05-07 17:30:04 +00:00
Amith Yamasani
007bbc0ed3 Fix javadoc typo 
Use @return, not @returns

Change-Id: I6c8fab2d236cf9c68c79090d3830bc3e01c8aa6f
 2014-05-07 10:23:44 -07:00
Guang Zhu
f8896f187d am 3e210d17: resolved conflicts for merge of 1e8a87dd to master 
* commit '3e210d179b80c1d09bb9b44c0aefde1daf3801cf':
  send accessibility events on view property invalidation
 2014-05-07 16:56:39 +00:00
Guang Zhu
4297409e45 resolved conflicts for merge of 1e8a87dd to master 
Change-Id: Id51218b4e2ca06344b5e7596ebde355fba9cfa54
 2014-05-07 09:51:11 -07:00
Craig Mautner
cf24765664 am d5a99922: Merge "Add attributes and flags for DocCentric." 
* commit 'd5a9992273039671f2a7155597cf4150599df761':
  Add attributes and flags for DocCentric.
 2014-05-07 16:05:49 +00:00
Craig Mautner
77f5a0f517 Merge "Add attributes and flags for DocCentric." 2014-05-07 16:00:03 +00:00
Craig Mautner
2dac056179 Add attributes and flags for DocCentric. 
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: I04acc9333c3725b4db94a954358eb78df507ff53
 2014-05-07 08:41:27 -07:00
Adam Connors
0c89304fe0 am e068ba87: Add enableSystemApp methods to DevicePolicyManager 
* commit 'e068ba879ea9a712bf7ad6c91e55238f76f122d9':
  Add enableSystemApp methods to DevicePolicyManager
 2014-05-07 15:25:19 +00:00
Adam Connors
010cfd4581 Add enableSystemApp methods to DevicePolicyManager 
These methods allow profile or device owners to enable
systems apps pre-installed in the primary user in the
managed profile. Apps can be specified by either package
name or intent.

Bug: 13587051

Change-Id: Ifcbc68c139308506b6c18cf3c0ea62b8026ff75f
 2014-05-07 16:20:38 +01:00
Julia Reynolds
49d1728855 am 5d24ddf3: Add new EDU user restrictions. 
* commit '5d24ddf35e25ad681cf8ec3228c4fa6aca523809':
  Add new EDU user restrictions.
 2014-05-07 14:24:42 +00:00
Julia Reynolds
d46d0f9dcd Add new EDU user restrictions. 
Change-Id: I6aad10466d99cda6be378c72025df686fe665071
 2014-05-07 09:51:16 -04:00
Adam Powell
fc49d6ef7a am e3172101: am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev 
* commit 'e31721019987ba80b00dd5ae1ba7fa2598f566a4':
  Clean up WindowInsets API for release
 2014-05-07 13:24:43 +00:00
Adam Powell
05ee2bd617 am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev 
* commit 'bfbddcad6004b7d178fb777c3a2b8b8a3dfe53ad':
  Clean up WindowInsets API for release
 2014-05-07 13:20:21 +00:00
Guang Zhu
1e8a87dd3c am f31d73c9: Merge "send accessibility events on view property invalidation" into klp-modular-dev 
* commit 'f31d73c9859a4124e5d4e618f4b147f55f693ef6':
  send accessibility events on view property invalidation
 2014-05-07 12:43:59 +00:00
Ben Murdoch
7d585c957d am db62ab87: Revert "Add attributes and flags for DocCentric." 
* commit 'db62ab87ca1ce18501e4c8ac9696bc220996d449':
  Revert "Add attributes and flags for DocCentric."
 2014-05-07 11:15:32 +00:00
Ben Murdoch
aeac6d8eb1 Revert "Add attributes and flags for DocCentric." 
Breaking the master build in check-api.

This reverts commit 5a8c07a2d2a35169f245908f6916355f09b3ebf4.

Change-Id: I985fa7ee02d704c34a551d901f6b36943542193d
 2014-05-07 11:10:16 +00:00
Guang Zhu
f31d73c985 Merge "send accessibility events on view property invalidation" into klp-modular-dev 2014-05-07 07:38:59 +00:00
Craig Mautner
ddf4c3d2b6 am 5a8c07a2: Add attributes and flags for DocCentric. 
* commit '5a8c07a2d2a35169f245908f6916355f09b3ebf4':
  Add attributes and flags for DocCentric.
 2014-05-07 06:53:26 +00:00
Matthew Xie
9be1c737f7 am 0a1f84b7: Merge "Add transport param to Connect APIs" 
* commit '0a1f84b7fe88cf89d305a913d6ab1143c225a290':
  Add transport param to Connect APIs
 2014-05-07 06:52:49 +00:00
Matthew Xie
73d9729e50 am bef8b7e2: Merge changes I0c808d51,I4ecf0ede 
* commit 'bef8b7e2e465355cedbed5f78012f8e29acf800c':
  Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
  Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit Bluetooth UUIDs. Added unit tests.
 2014-05-07 06:52:46 +00:00
Sharvil Nanavati
73625a1d07 am f6c78e59: Merge "Make sure BluetoothSocket#connect throws on error." 
* commit 'f6c78e590cf44defea2bcdea593485e958988962':
  Make sure BluetoothSocket#connect throws on error.
 2014-05-07 06:52:41 +00:00
Tao Bai
cd2b93260d am 1091e2c9: Public WebView permission API 
* commit '1091e2c9f7f2ee127cf5fc29285c7a7b6cc830f8':
  Public WebView permission API
 2014-05-07 06:52:31 +00:00
Craig Mautner
c6c035918a Add attributes and flags for DocCentric. 
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: Ie6bbbd890fa5f76cc6f2dae5f4bce3c8b22e085c
 2014-05-06 23:35:11 -07:00
Matthew Xie
ef10c85e3e Merge "Add transport param to Connect APIs" 2014-05-07 05:48:21 +00:00
Matthew Xie
8fce094491 Merge changes I0c808d51,I4ecf0ede 
* changes:
  Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
  Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit Bluetooth UUIDs. Added unit tests.
 2014-05-07 05:48:07 +00:00
Sharvil Nanavati
a0ee00ec13 Merge "Make sure BluetoothSocket#connect throws on error." 2014-05-07 05:22:21 +00:00
Tao Bai
fa1fd2cb7d Public WebView permission API 
BUG: 13699047
Change-Id: Ibcc8c0d4f1bba4365cb71c1991a0fcb1d7febb94
 2014-05-06 21:17:54 -07:00
Jim Miller
353bda0985 am d031e36c: First pass at adding FingerprintManagerService 
* commit 'd031e36c433c94fc6da3732be7e61aa906e45ec4':
  First pass at adding FingerprintManagerService
 2014-05-07 02:32:29 +00:00
Jim Miller
08fa40c5cb First pass at adding FingerprintManagerService 
This adds a new service for monitoring and enrolling fingerprints
to the platform.

Fixed documentation links.

Change-Id: I66013be5e09be9c5f9746c46aacf32d3e26c3b73
 2014-05-07 02:27:21 +00:00
Ganesh Ganapathi Batta
b88fa824ab Add transport param to Connect APIs 
Support for passing preferred transport for GATT connections as part of
Connect APIs

Change-Id: I93938dce519b8fa12de41d7e8690dc9355ce2dc5
 2014-05-06 19:20:46 -07:00
Sharvil Nanavati
37fce07bea Tear down PAN if we can't successfully complete a DHCP request 
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
 2014-05-06 19:20:46 -07:00
Wei Wang
82500dd866 Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit 
Bluetooth UUIDs. Added unit tests.

Change-Id: I4ecf0ede02561a5e9815acf8a5a1309d5756b887
 2014-05-06 19:20:46 -07:00
Sharvil Nanavati
3e8eb40950 Make sure BluetoothSocket#connect throws on error. 
It sometimes fails silently, resulting in callers using the socket
even though it hasn't been initialized.

http://b/13909270

Change-Id: Ied08982b51d44c3d2dec72785888ea6c6497a664
 2014-05-06 19:20:45 -07:00
Guang Zhu
84e2509823 send accessibility events on view property invalidation 
from certain call sites of invalidateViewProperty, appropriate
accessibility event needs to be delivered as well.

Below is a list of call references found, ones with "*" are
modified by this change:

package: android.view
View
  *offsetLeftAndRight(int) (4 matches)
  *offsetTopAndBottom(int) (4 matches)
  *setAlpha(float)
  setCameraDistance(float) (2 matches)
  setLayerPaint(Paint)
  setPivotX(float) (2 matches)
  setPivotY(float) (2 matches)
  *setRotation(float) (2 matches)
  *setRotationX(float) (2 matches)
  *setRotationY(float) (2 matches)
  *setScaleX(float) (2 matches)
  *setScaleY(float) (2 matches)
  setTransitionAlpha(float)
  *setTranslationX(float) (2 matches)
  *setTranslationY(float) (2 matches)
ViewGroup
  *offsetChildrenTopAndBottom(int)
ViewOverlay
  OverlayViewGroup
    invalidateViewProperty(boolean, boolean) (2 matches)
ViewPropertyAnimator
  AnimatorEventListener
    onAnimationUpdate(ValueAnimator) (2 matches)

Bug: 14262013

Change-Id: Ibc9ed438f476ad10a6ad8df668142958c5903f55
 2014-05-06 18:23:15 -07:00
Jeff Brown
88cf32e300 am 31c0962a: Merge "Fix crash due to texture view callback threading invariants." 
* commit '31c0962a2cdb507486507cc96d7b9a214e9849d3':
  Fix crash due to texture view callback threading invariants.
 2014-05-07 00:51:50 +00:00
Jeff Brown
6c8e788e37 Merge "Fix crash due to texture view callback threading invariants." 2014-05-07 00:47:08 +00:00
Adam Powell
bfbddcad60 am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev 
* commit '4f295fe8c66ef2878d93be420f73745d88422e35':
  Clean up WindowInsets API for release
 2014-05-07 00:35:31 +00:00
Chet Haase
69eb2f830f am 44dbef7e: Merge "Doc fix in TypeEvaluator method docs" 
* commit '44dbef7ea2082ad5ca7f6671d41c59ffd7d8cee1':
  Doc fix in TypeEvaluator method docs
 2014-05-07 00:23:33 +00:00
Jeff Brown
c7282e57cd Fix crash due to texture view callback threading invariants. 
Allow the client of a SurfaceTexture to specify the Handler to
which the update callback should be directed to avoid unnecessary
scheduling ping-pong between threads.

Fixed an invalid assumption in TextureView that it is attached
to the main looper which could result in a crash under certain
circumstances.  In normal app processes, it is true that TextureViews
must be created on the main looper since hardware rendering is
currently only supported on the main looper.  However, in the
system server, UI components run a different thread.  Although
hardware rendering is normally disabled in the system server,
it may be enabled for certain developer features.

Bug: 14445309
Change-Id: I5ae17ad018b9ef05ba87ec2f972c7c82e2bca70a
 2014-05-06 17:13:43 -07:00
Chet Haase
5f9ea81c99 Doc fix in TypeEvaluator method docs 
Change-Id: Ie20ba820b0a3a6b8f0f6120dfcfc8bba6adf29b3
 2014-05-06 17:07:16 -07:00
Adam Powell
f4a3941ebe Clean up WindowInsets API for release 
Hide window decor inset methods and rename the clone* methods to have
less baggage.

Bug 14566960

Change-Id: Ia06bb959fd77acd6ff69f337c3200047a529612a
 2014-05-06 16:27:59 -07:00
Glenn Kasten
d9ead65094 am acd554ab: Merge "Add AudioFormat.getBytesPerSample and use it" 
* commit 'acd554abffd5bdf46ff6b2606af90aaa519a7c08':
  Add AudioFormat.getBytesPerSample and use it
 2014-05-06 23:10:50 +00:00
Glenn Kasten
8547e7022e Merge "Add AudioFormat.getBytesPerSample and use it" 2014-05-06 23:09:07 +00:00
Zhijun He
c5694ab534 am 1bb5da95: Camera2: Add missing capture result tags 
* commit '1bb5da9543f941430c75e122c8d07a15fa6e2d9e':
  Camera2: Add missing capture result tags
 2014-05-06 21:52:07 +00:00