Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,008 Commits 3 Branches 0 Tags
40878bebf55acce8f3a3e50cae86185b203df656
Commit Graph

36331 Commits

Author SHA1 Message Date
Jason Monk
40878bebf5 am 59e6e796: Merge "Fix Docs breakage" 
* commit '59e6e796dae4e3e6436c7c714510155931183990':
  Fix Docs breakage
 2014-05-07 23:45:08 +00:00
Vinod Krishnan
6c6fd8ad50 am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'f215073420706e29305da762fa5f9f53dcf330ff':
  Adding a HeartRate Feature
 2014-05-07 23:44:59 +00:00
Brian Carlstrom
ea4facab1c am a599245c: Merge "resolved conflicts for merge of 3bbef521 to master" 
* commit 'a599245ca0d4886842bff4257e254adaf6743e5f':
  Use package usage information to decide what dex files to optimize in PackageManagerService
 2014-05-07 23:43:38 +00:00
John Reck
14d5767c37 am 9cdc11c6: Merge "Cleanup attachFunctor" 
* commit '9cdc11c684756336734399dac16476a24b8348ef':
  Cleanup attachFunctor
 2014-05-07 23:43:30 +00:00
Zhijun He
02157bb93f am eb440873: Camera: remove some DNG tags 
* commit 'eb44087344cb545f97f78b802dc91bfec252f0f7':
  Camera: remove some DNG tags
 2014-05-07 23:42:39 +00:00
John Reck
b53f2b7882 am 47003dcd: Merge "Implement TODO(romainguy)" 
* commit '47003dcd3993f06416c63b2a781ef43c6f5feed3':
  Implement TODO(romainguy)
 2014-05-07 23:42:32 +00:00
Jason Monk
fab0126136 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
 2014-05-07 22:57:45 +00:00
Jason Monk
faf3fd59d5 Fix Docs breakage 
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
 2014-05-07 18:41:13 -04:00
Brian Carlstrom
095652d3cb Merge "resolved conflicts for merge of 3bbef521 to master" 2014-05-07 22:06:24 +00:00
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
 2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master 
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
 2014-05-07 14:46:40 -07:00
John Reck
832b151465 Cleanup attachFunctor 
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
 2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags 
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
 2014-05-07 21:33:23 +00:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
John Reck
63a0667325 Implement TODO(romainguy) 
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
 2014-05-07 13:45:54 -07:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp 
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
 2014-05-07 13:20:23 -07:00
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