Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
93fc415e62 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 
automerge: e76308c

* commit 'e76308c5d62984132192119f3d0bc407f89a2100':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:22:11 +00:00
Bryce Lee
358d19065b Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 automerge: 5c14bc2 
automerge: 70532bf

* commit '70532bf46433519a27ecada265b6de9364f51f39':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
 2014-11-12 03:19:50 +00:00
Winson Chung
d7b557fb28 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev automerge: 4ff2526 
automerge: 1314e9a

* commit '1314e9a25921e7b87fc94db46e690b07d446237d':
  Adding null checks for unset stack. (Bug 18329447)
 2014-11-12 03:18:47 +00:00
Craig Mautner
b39f5510f4 Show error dialogs over apps that dismiss keyguard automerge: c08eab8 
automerge: 2b9e9f4

* commit '2b9e9f417f88ff385b37f01257748b050e505eb6':
  Show error dialogs over apps that dismiss keyguard
 2014-11-12 03:16:39 +00:00
Winson Chung
9922539fac Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev automerge: 147de3a 
automerge: 6a601c9

* commit '6a601c9ee8cee46680417dc450e9bb64c86a1b09':
  Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
 2014-11-12 03:15:25 +00:00
Amith Yamasani
e73cab5f12 Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d 
automerge: 15de62d

* commit '15de62de26a3ef936a219daf65ec5d388197a9fc':
  Allow profile owners to set the unknown source setting
 2014-11-12 03:13:59 +00:00
Junda Liu
829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f 
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:12:51 +00:00
Alan Viverette
2d91f63ec2 Don't propagate AnimatedStateListDrawable state change to super() 
Also updates child element inflation code in AnimationDrawable so
that color resources can be used in the <item> drawable attribute.

BUG: 18322272
Change-Id: I8d13643c5cbdb76d69634a7bac3cead9e9fba4e8
 2014-11-11 19:12:32 -08:00
Elliott Hughes
5b6683c04a am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder" 
* commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417':
  Prevent resource leak in YuvToJpegEncoder
 2014-11-12 02:53:35 +00:00
Andreas Gampe
6f4c0f8e9f am bc0b57f3: Merge "Frameworks/base: Right transform in DngCreator" 
* commit 'bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 02:53:28 +00:00
Elliott Hughes
2fa1e48692 am 7c4ef052: Merge "Fix for CharSequenceCreator test case" 
* commit '7c4ef052d521d5ccf8acfb03c9332b59ea737cea':
  Fix for CharSequenceCreator test case
 2014-11-12 02:53:22 +00:00
Andreas Gampe
dbf16c6fa0 am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI" 
* commit 'db387066037bc6892331a5c7ea52a85d416acdaa':
  Frameworks/base: Fix FingerprintManager JNI
 2014-11-12 02:53:17 +00:00
Andreas Gampe
a156c5a60c am 316e75fe: Merge "Frameworks/base: Wall Werror in rs" 
* commit '316e75fee668c0bbf095ea8124946c5c4d396880':
  Frameworks/base: Wall Werror in rs
 2014-11-12 02:53:07 +00:00
Paul Soulos
f6899c8d48 Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
automerge: f20aeaa

* commit 'f20aeaa0333ee9d550adbad4c9e901d3db0bd48c':
 2014-11-12 02:51:41 +00:00
Ihab Awad
ba595fad5a am cf9248cb: am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
automerge: e323ff0

* commit 'e323ff0653b07bca0c665be8f3fc5415e27bd2c7':
  Update PhoneAccount icon API (1/6)
 2014-11-12 02:48:29 +00:00
Jeff Brown
70170261cb am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7 
automerge: a473878

* commit 'a4738781584d58e133fc4d0f55d9b7ebcb246ff6':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 02:46:10 +00:00
Ihab Awad
96802adcb8 Fix PhoneAccount parceling (1/2) 
Bug: 18343731
Change-Id: Ie69d33cec5e184f1b33d2b4225b8f3dc9ff50f82
 2014-11-11 18:43:13 -08:00
Adam Lesinski
3df1c38ee0 Fix ParceledListSlice to enforce the same concrete types among its elements. 
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
 2014-11-12 02:28:11 +00:00
Alan Viverette
0bc1eee096 Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev 
automerge: b724314

* commit 'b724314516dc15ab7afb62f7a6e63d94f4022011':
  Reduce number of saveLayer calls in RippleDrawable
 2014-11-12 02:26:04 +00:00
vandwalle
39c5118037 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 
automerge: 3f558e7

* commit '3f558e7285d8632b81cde4a9f1d0829e02be5fa0':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 02:24:40 +00:00
Wink Saville
e76308c5d6 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 43bbf30

* commit '43bbf30a06a2aee05db9b80b287672017fbada5c':
  Update SubscriptionManager API as per API council.
 2014-11-12 02:23:03 +00:00
Alan Viverette
b724314516 Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev 2014-11-12 02:04:22 +00:00
Elliott Hughes
34acb4c8d4 Merge "Prevent resource leak in YuvToJpegEncoder" 2014-11-12 01:45:42 +00:00
Andreas Gampe
bc0b57f336 Merge "Frameworks/base: Right transform in DngCreator" 2014-11-12 01:44:30 +00:00
Elliott Hughes
7c4ef052d5 Merge "Fix for CharSequenceCreator test case" 2014-11-12 01:38:58 +00:00
Dianne Hackborn
ec452d9ff5 Put native apps above browser in resolver activity. 
Add a special case for situations where we have some activities
that are matching a URI host/path, so that these are ordered
above others.  This only happens when dealing with http or https
intents, for ordering native apps above the browser.

Change-Id: I21f3361229bc7a1ebefda66373d31b6b1fd19973
 2014-11-11 17:38:12 -08:00
Chris Craik
f37a364a53 Add details and performance warnings to save flag docs 
bug:18239290

Change-Id: I5f73bf3f1bf01c8db6ab085b182b14348e47fb3e
 2014-11-11 17:37:04 -08:00
Bryce Lee
70532bf464 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 
automerge: 5c14bc2

* commit '5c14bc213be3e311c150b7cb86dc880937b3b7b7':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
 2014-11-12 01:21:13 +00:00
Winson Chung
1314e9a259 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev 
automerge: 4ff2526

* commit '4ff2526ef8d168d3c591f1a19de4dca76745c157':
  Adding null checks for unset stack. (Bug 18329447)
 2014-11-12 01:20:15 +00:00
vandwalle
3f558e7285 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:10 +00:00
Craig Mautner
2b9e9f417f Show error dialogs over apps that dismiss keyguard 
automerge: c08eab8

* commit 'c08eab81f30a3120ec0929d3508b4a78d498e1ff':
  Show error dialogs over apps that dismiss keyguard
 2014-11-12 01:17:48 +00:00
Winson Chung
6a601c9ee8 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
automerge: 147de3a

* commit '147de3a9766e205af068d1462beaea7a4a9fb9bc':
  Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
 2014-11-12 01:16:47 +00:00
Amith Yamasani
15de62de26 Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 
automerge: 93ffd5d

* commit '93ffd5dc0a243af87f8ba106fe98df7a7ed2c484':
  Allow profile owners to set the unknown source setting
 2014-11-12 01:15:16 +00:00
Junda Liu
5716ebe50d Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 
automerge: 2eb5a5f

* commit '2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 01:14:00 +00:00
Wink Saville
43bbf30a06 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:04 +00:00
Jean-Michel Trivi
fd6ad747e6 Support for delayed audio focus 
New internal API for an audio focus requester to always enter
 the audio focus stack even if audio focus can't be granted
 immediately (e.g. during a phone call).
Remap the "no delay" interface to the new "requestAudioFocus"
 method signature and AIDL.

Bug 16010554

Change-Id: Iff91ddb0beb411cca1f8cf98300a9afc4178dc7f
 2014-11-11 17:07:45 -08:00
Bryce Lee
5c14bc213b Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev 
automerge: 68f9773

* commit '68f97736e65f1be4664fd3c3765fc621f3b76c3a':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
 2014-11-12 01:02:49 +00:00
kmccormick
de53b041c1 Doc update: new reg error code + snippet 
Change-Id: Ie8df1cc68ebe5a2a6589d34f16e554e36dca546e
 2014-11-11 16:56:54 -08:00
Aravind Akella
1375d3744c Sensor documentation fixes. 
Bug: 17526079
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
(cherry picked from commit 1f9b32f006)
 2014-11-12 00:52:44 +00:00
RoboErik
9c7854014d Use the suggested stream if it's currently active 
This makes the MediaSessionService check if the suggested stream is active
when dispatching a volume event and prefer it to a remote session if it is.
This mostly affects apps that use Activity.setVolumeControlStream.

bug:18318480
Change-Id: Ib8825394bf7a223fbd92bcb2c3ecb7c596ce7c29
 2014-11-11 16:52:26 -08:00
Winson Chung
4ff2526ef8 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev 2014-11-12 00:35:37 +00:00
Paul Soulos
f20aeaa033 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-12 00:30:41 +00:00
Ihab Awad
e323ff0653 am cf9248cb: am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit 'cf9248cbf5461c8bf2fbae544c96bd0b5e7b5e02':
  Update PhoneAccount icon API (1/6)
 2014-11-12 00:28:26 +00:00
Ihab Awad
8c5f5fbdff am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
automerge: cf9248c

* commit 'cf9248cbf5461c8bf2fbae544c96bd0b5e7b5e02':
  Update PhoneAccount icon API (1/6)
 2014-11-12 00:27:21 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 00:24:43 +00:00
Craig Mautner
c08eab81f3 Show error dialogs over apps that dismiss keyguard 
Error dialogs absorb all input to ensure that they are not missed.
This can cause the screen to lock up if they are not displayed but
are still absorbing touches. This was what was happening when there
was an error dialog up at the same time as a phone call came in as
in b/17648830.

This fix recognizes when an app is dismissing the keyguard and
forces any error dialogs to be shown over such an app.

This also removes the private flags from the input system as they
are no longer needed.

Fixes bug 17648830.

Change-Id: I5c98b8265a1448b445fdb2f745fc78892f8656a4
 2014-11-11 16:22:56 -08:00
Winson Chung
4ee0eb3c46 Adding null checks for unset stack. (Bug 18329447) 2014-11-11 16:11:52 -08:00
Winson Chung
147de3a976 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-11-12 00:10:55 +00:00
Winson Chung
a91c293be2 Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345) 
This change ensures that only the number of visible thumbnails and task icons are
loaded to minimize the delay required when initializing the stack without the 
cache.  In addition, this change reduces the number of times that the task stack
is recomposed when launching recents (in addition to the number of calls to 
getRecentTasks()).

There is also a fix to a regression where the exit trigger is not run when the
task stack view is empty.

Change-Id: I75834ff3c57c0e5dad6252b982f71c6e740071f2
 2014-11-11 16:10:05 -08:00
Amith Yamasani
93ffd5dc0a Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 2014-11-12 00:07:59 +00:00