drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
142,862 Commits 1 Branch 0 Tags
Commit Graph

142862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
4b8aa28ef2 Fix sdk build. 
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
 2014-07-17 14:30:54 -07:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Craig Stout
f83ccb9647 Fix legacyMode for leanback timepicker 
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
 2014-07-17 20:50:13 +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
Zhijun He
dcb743e276 Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 2014-07-17 18:11:21 +00:00
Zhijun He
83159151f6 Camera2: replace partial quirks with normal partial result 
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
 2014-07-17 20:08:32 +00:00
John Spurlock
edbaa7d293 Merge "QS: Fix crash switching users." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
8b0249da3e QS: Fix crash switching users. 
Bug:16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
 2014-07-17 15:53:32 -04:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack. 
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
 2014-07-17 11:09:46 -07:00
Jeff Sharkey
69eef8a0d2 Merge "Support cluster-style installs for bundled apps." into lmp-dev 2014-07-17 18:05:14 +00:00
Jeff Sharkey
1e9189a276 Support cluster-style installs for bundled apps. 
Bug: 16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
 2014-07-17 11:07:12 -07:00
Sandeep Siddhartha
f8cf71d753 Support model deletion 
the updateKeyphrase call is also used to clear out a sound model currently,
this happens when the sound model passed in has no keyphrases.

We can revisit if we need another deleteSoundModel method

- Also fix an issue with the way we were writing keyphrase to the DB
  and when updating keyphrase, we actually addOrUpdate

Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
 2014-07-17 11:01:25 -07:00
Craig Mautner
e2e280ec59 Merge "Restore calling identity before checking permission" into lmp-dev 2014-07-17 17:59:02 +00:00
Craig Mautner
85c11a8831 Restore calling identity before checking permission 
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Fixes bug 16215650.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
 2014-07-17 12:38:18 -07:00
RoboErik
69b86207bf Merge "return false for media keys if no controller" into lmp-dev 2014-07-17 18:05:14 +00:00
RoboErik
28204a768e return false for media keys if no controller 
bug:16311395
Change-Id: I4cde865858f99a9159abc181cc987fbd9866025b
 2014-07-17 12:18:32 -07:00
Joe Fernandez
9142a0f80c am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit '64ae930359619f2a49c8a4bef5dc45261c772d45':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:16:10 +00:00
John Reck
21f61b7d87 Merge "Fix logging" into lmp-dev 2014-07-17 18:05:14 +00:00
John Reck
5cdb8f998c Fix logging 
Bug: 16357287

Change-Id: Ic14e32c941e42ab1f1ed51ff8ed7185979e57a55
 2014-07-17 18:12:01 +00:00
Ruben Brunk
84cca777e2 Merge "camera2: Fix swapped Face detection commands." into lmp-dev 2014-07-17 18:11:21 +00:00
Joe Fernandez
64ae930359 am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e1e81a9ee0f3632898eff1056fd2283b79789e23':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:04:47 +00:00
Ruben Brunk
40001f5dac camera2: Fix swapped Face detection commands. 
Bug: 16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
 2014-07-17 18:04:42 +00:00
ztenghui
738177caf6 Add the RTL support to VectorDrawable. 
bug:15905631

Change-Id: Ieb3dcac2dd446ba89f307716411688dcd6ec5279
 2014-07-17 17:37:19 +00:00
John Reck
580ff8142b Revert "Separate Canvas JNI code from the implementation." 
This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.

 Appears to cause memory corruption and random appearances of
 chinese

 Bug: 16343240
 Bug: 16336642

Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
 2014-07-17 17:36:24 +00:00
Winson Chung
4fc90de51b Fixing regression in flinging not updating the stack. (Bug 16371020) 
Change-Id: I6397c854dc0d305206eb3b48de855c58cf2740ea
 2014-07-17 17:33:03 +00:00
Joe Fernandez
e1e81a9ee0 am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps
 2014-07-17 16:44:19 +00:00
Craig Mautner
b3325cbb26 Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
aa9b0f1575 resolved conflicts for merge of 0a931069 to lmp-dev 
Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
 2014-07-17 10:50:18 -07:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev 
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
 2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev 
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
 2014-07-17 10:55:56 +00:00
Filip Gruszczynski
95198b9166 am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev 
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.
 2014-07-17 10:55:43 +00:00
Eino-Ville Talvala
7040e9f7fe Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 2014-07-17 02:40:09 +00:00
Winson Chung
2f906e94c8 Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 2014-07-17 17:59:02 +00:00
Winson Chung
ff88d7b39e Fixing optimization in Task loading. (Bug 16372369) 2014-07-17 12:30:07 -07:00
Chris Craik
5d705ee6ad Merge "Minor cleanups around color usage" into lmp-dev 2014-07-17 18:05:14 +00:00
Chris Craik
98d608dba6 Minor cleanups around color usage 
Change-Id: I56733cbe933a58d5977c032f056abb35265ee252
 2014-07-17 12:25:11 -07:00
Chris Craik
6712495297 Merge "Simplify ViewRootImpl's AttachInfo usage" into lmp-dev 2014-07-17 18:05:14 +00:00
Chris Craik
d36a81f392 Simplify ViewRootImpl's AttachInfo usage 
Change-Id: I4230e95ed5a52c8c5fae7d7b8d58827925db13ba
 2014-07-17 11:14:15 -07:00
Eino-Ville Talvala
611fecec08 Add PackageManager features for differentiating camera2 devices 
Also rename DNG capability to RAW.

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
 2014-07-17 10:58:16 -07:00
Amith Yamasani
bb4d6a20bd Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 2014-07-17 02:34:24 +00:00
Amith Yamasani
390989da19 Split telephony restrictions into outgoing calls and sms 
DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.

Outgoing emergency calls should always be permitted.

Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
 2014-07-17 12:14:52 -07:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling 
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
 2014-07-17 11:37:59 -07:00
Andrew Lee
e7a7ec6db5 Merge "Pass through video state when answering a call." into lmp-dev 2014-07-17 02:29:54 +00:00
Andrew Lee
8da4c3c11f Pass through video state when answering a call. 
Bug: 16013878
Bug: 16015750
Change-Id: Ia9ba6e5f78fcb64e1089db99f5ce11d0ef858ac9
 2014-07-17 12:56:49 -07:00
Evan Charlton
9c33953e51 Merge "Plumb through StatusHints change notifications" into lmp-dev 2014-07-17 19:20:15 +00:00
Evan Charlton
5b49adea48 Plumb through StatusHints change notifications 
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.

Bug: 13334257
Bug: 13334252

Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
 2014-07-17 12:53:39 -07:00
Adam Connors
c8fa3ae2ce Merge "Create DPM APIs for cross profile callerId" into lmp-dev 2014-07-17 00:15:07 +00:00
Adam Connors
210fe21e95 Create DPM APIs for cross profile callerId 
Contact information in the managed profile is shown
in the incoming call UI unless blocked using this API.

TODO: Actually plumb this into the caller-id logic.

Bug: 16301261
Change-Id: If03adc907d9558baa0a45a1833b857206b7bf96a
 2014-07-17 16:28:52 +01:00
Niels Egberts
b4a139cc12 Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 2014-07-17 00:15:07 +00:00
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call 
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
 2014-07-17 10:19:20 -07:00