Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,494 Commits 3 Branches 0 Tags
abd5eabeca695fd1338806d97de825bf4e91abf8
Commit Graph

41752 Commits

Author SHA1 Message Date
Jim Miller
abd5eabeca am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '656d09edfddcc748fa56acd455f579cc08057848':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-20 02:17:13 +00:00
Andre Eisenbach
49ddceef7e am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit '92adbade49f741888b69691981e9367aef357b45':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:38:28 +00:00
Christopher Tate
4e6d105b0e am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev 
* commit '0f5b9306328af0c476bb71eed78e63a65e0898ac':
  Tear down agents properly at EOD in full restore
 2014-07-18 19:23:09 +00:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4) 
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
 2014-07-18 12:13:46 -07:00
Dan Sandler
cfa9259a62 am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev 
* commit 'f984501170f7449a38c6785675dd9f460f5bffa4':
  Deprecate and stop generating tickerViews.
 2014-07-18 18:59:38 +00:00
Dan Sandler
e9381b5e9b am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev 
* commit 'e7dc51401bb6a0341c34ccc4b5b04902f0ba997d':
  Actually show secret notifications sometimes.
 2014-07-18 18:59:31 +00:00
Brian Attwell
a683b2a29c am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 
* commit 'a08e00c7026c6b093fc927a03c168d2ed3b11986':
  Mark social APIs stream APIs as deprecated
 2014-07-18 18:59:27 +00:00
Narayan Kamath
d373c004b0 am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 
* commit '3b29a42453c798bbaa8a37ce415cd72ca7b1a2c6':
  Fix broken locale related assumptions in TextServicesManager.
 2014-07-18 16:38:01 +00:00
Niels Egberts
d66f900acb am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 
* commit '9a35945f774b94abfadff485e6f90de49938c402':
  New TtsSpan builders for types measure, time, date, digits and verbatim.
 2014-07-18 15:58:42 +00:00
Niels Egberts
883f961ee0 am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 
* commit '50084b07ea1b513a63f236c5e75f66a521f1715e':
  Add builders for TtsSpans of type ordinal, decimal and fraction.
 2014-07-18 15:33:41 +00:00
Bryan Mawhinney
ce6ee80fa2 am bd7f8215: am d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 
* commit 'bd7f8215c9af9c48c4d4bd802d0712a8c0eac66b':
  Default MediaStyled notifications to CATEGORY_TRANSPORT
 2014-07-18 11:45:13 +00:00
Jae Seo
353bdd484f am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit 'b719bf5720ea501fa6324d866e49e65b59b1a182':
  TIF: Add TvParentalControlManager
 2014-07-18 03:30:41 +00:00
Jeff Brown
e048698b4b am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit '9560a0797de1ce25952c9e8a0b124f49f8cf102e':
  Add glance sensor for doze mode.
 2014-07-18 03:16:58 +00:00
Marcin Kosiba
64fcb8c3f9 am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API. 
* commit '8ea71bf3c3e3face48160a1de82b9f2a71616c0b':
  Add a WebView.zoomBy API.
 2014-07-18 03:09:31 +00:00
Zhijun He
08da81b41b am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev 
* commit 'fb29d478e9407a6d0dc5b20bb7f2f23ecde4d3da':
  Camera2: partialResultCount should be optional
 2014-07-18 03:09:25 +00:00
Jinsuk Kim
90f54bb704 am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev 
* commit 'eff7b1af6ab496ee64882ad21f1d58269fd37f4a':
  Remove system audio output option for HdmiControlService
 2014-07-18 02:51:28 +00:00
Craig Stout
abe7b54fb5 am 79de62b3: am 51ff3b68: Fix timepicker double done buttons. 
* commit '79de62b38cd94629aa09883120becec6faae2229':
  Fix timepicker double done buttons.
 2014-07-18 02:51:12 +00:00
Marcin Kosiba
3ee06efef3 Add a WebView.zoomBy API. 
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.

BUG: 13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
 2014-07-18 02:18:44 +01:00
Michael Wright
e4da19a9f1 am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev 
* commit 'e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
  Add MediaProjection APIs.
 2014-07-18 00:32:13 +00:00
Ben Murdoch
3aa88cd61a am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 23:48:26 +00:00
destradaa
eccc5480a6 am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 23:48:08 +00:00
Andres Morales
f9f7474687 am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
  Permit settings to "wipe" the persistent partition
 2014-07-17 23:47:52 +00:00
Zhijun He
3ddb88ecd3 am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '3bce07590a097d2e904daa549e3083415e3c4051':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 23:47:45 +00:00
Craig Stout
abdd154334 Fix timepicker double done buttons. 
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.

Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
 2014-07-17 23:28:48 +00:00
Jim Miller
06e345089a Add DevicePolicyManager flag for fingerprint. 
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
 2014-07-18 20:48:34 +00:00
Christopher Tate
1787d9c51e Merge "Tear down agents properly at EOD in full restore" into lmp-dev 2014-07-17 21:58:28 +00:00
Christopher Tate
89101f7fe8 Tear down agents properly at EOD in full restore 
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.

Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.

Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.

Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
 2014-07-17 19:12:09 -07:00
Michael Wright
c7a845de4a Merge "Add MediaProjection APIs." into lmp-dev 2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs. 
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
 2014-07-17 14:30:19 -07:00
Zhijun He
d1d2d43fc0 Merge "Camera2: partialResultCount should be optional" into lmp-dev 2014-07-17 21:09:48 +00:00
Zhijun He
1420de4162 Camera2: partialResultCount should be optional 
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
 2014-07-17 17:45:54 -07:00
Jinsuk Kim
fe61a67bb9 Merge "Remove system audio output option for HdmiControlService" into lmp-dev 2014-07-17 21:07:39 +00:00
Eino-Ville Talvala
aff282506f am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 20:59:30 +00:00
Chris Craik
e7edf9587e am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit 'deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 20:59:17 +00:00
Amith Yamasani
74b5b4005b am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 20:59:12 +00:00
Adam Powell
128beccbe5 am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
  Add nested pre-fling for nested scrolling
 2014-07-17 20:58:56 +00:00
Ruben Brunk
e5d53bd1ba am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit 'ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
  camera2: Fix swapped Face detection commands.
 2014-07-17 20:58:38 +00:00
Christopher Tate
be786a1f69 am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit '5763ad39f5cb5923b910c7cbd834707f65043bde':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 20:58:09 +00:00
Adam Connors
f8904a2b43 am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
  Create DPM APIs for cross profile callerId
 2014-07-17 20:57:53 +00:00
Niels Egberts
f8f3a34570 am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 
* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
  TtsSpan builders for each TtsSpan type. DO NOT MERGE
 2014-07-17 20:57:50 +00:00
Martin Kosiba
0db75fe2b0 am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager. 
* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
  Allow for appending of resources to an AssetManager.
 2014-07-17 20:57:38 +00:00
Alexandra Gherghina
02e130fccf am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 20:57:31 +00:00
Andres Morales
963295ea10 Permit settings to "wipe" the persistent partition 
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
 2014-07-17 20:42:04 +00:00
Narayan Kamath
53777b58f3 Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 2014-07-17 19:51:18 +00:00
Narayan Kamath
6648dded69 Fix broken locale related assumptions in TextServicesManager. 
startsWith is a bogus check unless languages match. Also, don't
assume 2 letter languages.

bug: 10090157
Change-Id: I8adda61bddc465aac261c0ce2023fa9606affe1b
 2014-07-18 15:02:34 +01:00
Niels Egberts
6e7c8995dd New TtsSpan builders for types measure, time, date, digits and verbatim. 
Change-Id: I60022aa72c64f454261a0b69c21c45ce6351b9e7
 2014-07-18 16:36:11 +01:00
Niels Egberts
f976abe700 Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
a896363400 Add builders for TtsSpans of type ordinal, decimal and fraction. 
Also document the possibility to give phone numbers in parts.

Change-Id: Ie1cdf56cc3b6c221c9410fb02dcba2568ea337b7
 2014-07-18 13:43:22 +01:00
Bryan Mawhinney
8a97d9dfc5 Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 2014-07-17 19:45:26 +00:00
Bryan Mawhinney
6be8de36e6 Default MediaStyled notifications to CATEGORY_TRANSPORT 
This makes it easier to identify them later (e.g., for filtering).
The developer can always specify a different category if preferred.

Also fixed some javadoc related to setMediaSession()

Change-Id: I5f28514758218ff66fdbaa9fd37ccb19f12d4852
 2014-07-18 10:35:12 +01:00