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

167742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
4d974fa942 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 3f558e7 
automerge: 39c5118

* commit '39c5118037b5f401217db0fa5ac934291f45e378':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 03:23:35 +00:00
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
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
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
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
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
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
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
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Bryce Lee
68f97736e6 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 2014-11-11 23:59:34 +00:00
Andreas Gampe
db38706603 Merge "Frameworks/base: Fix FingerprintManager JNI" 2014-11-11 23:47:53 +00:00
Andreas Gampe
316e75fee6 Merge "Frameworks/base: Wall Werror in rs" 2014-11-11 23:47:25 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting 
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
 2014-11-11 23:38:24 +00:00
Ihab Awad
cf9248cbf5 am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit '9114a845d9474bc2ecc807c3f195fe0c5314556c':
  Update PhoneAccount icon API (1/6)
 2014-11-11 23:02:22 +00:00
Ihab Awad
9114a845d9 Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 2014-11-11 22:56:08 +00:00
Jeff Brown
c1275e72ec am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
* commit '32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9':
  Move device admin max screen off timeout to internal interface.
 2014-11-11 22:48:23 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Adam Lesinski
be6c125783 am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 
automerge: 1e2e05b

* commit '1e2e05bf8cb1445f9e431ca54837bb01f762d9e6':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 22:15:44 +00:00
Chris Wren
3aa19984ad am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 
automerge: 56c1037

* commit '56c1037767fd77116c8de4021a56d761c6bd288c':
  Add event logs when we launch fullscreen notications.
 2014-11-11 22:14:44 +00:00
Prabhakar Thirumoorthy
f82ab735a7 am 2cc8043c: Merge "If task isn\'t found in recents, look in the stacks." into lmp-mr1-dev 
automerge: d476bfd

* commit 'd476bfd01b7443d63381141d14a20833421d8657':
  If task isn't found in recents, look in the stacks.
 2014-11-11 22:11:23 +00:00
Ihab Awad
476cc83558 Update PhoneAccount icon API (1/6) 
Responding to comments by jeffbrown@ in http://ag/574833

Bug: 18291787

Change-Id: I011aa59642f1ca6998bce76a59850909d2daa987
 2014-11-11 13:18:49 -08:00