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

153207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f3ff29dfb6 am 80113a79: am 1453241b: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '80113a79ead632aeb75a2e2c90fe4cfc09de28a4':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 08:40:41 +00:00
Mike Lockwood
5851d09f96 am e996ea18: am ad421a8b: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 
* commit 'e996ea18efd8a307d6d933348275a47d234f8e37':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 08:40:37 +00:00
Alan Viverette
684f37ce9a am 4ed54216: am 89b0ec71: am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit '4ed54216fa061be0062375de9bbf755ba5db20ae':
  Always apply window insets to action modes
 2014-09-19 08:40:33 +00:00
Amit Mahajan
7f76d9051d am 4b797fd9: am 7db61d63: am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit '4b797fd9e5864364f546e234e022fb92e9380a62':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 08:40:29 +00:00
Yigit Boyar
ae3164500a am 4a7c96d4: am 05041606: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '4a7c96d430afc28c6ac02c60a59cfc91097cafe6':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 08:40:25 +00:00
Winson Chung
8bc47ed3d3 am d7eb771e: am c164cf2a: am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit 'd7eb771e182bf41be04e664179186c9f7707bbde':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 08:40:03 +00:00
Winson Chung
29768bf5d8 am 0dd9add1: am 06ec3d55: am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit '0dd9add1c641f59e78e6315ea0fa3cb61a72fb64':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 08:39:59 +00:00
Craig Mautner
617944a319 am 4e349966: am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '4e349966592af3762c1bf1fd09d951b71d38f50e':
  Don't count finishing activities as effective activities.
 2014-09-19 08:39:36 +00:00
George Mount
1c3eb5c623 am 91cba7d9: am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '91cba7d900395ebc101c24238e2b18d48bf1a4b2':
  Fix broken logic in isValidTarget
 2014-09-19 08:39:28 +00:00
Winson Chung
3394ba6666 am 16dcd64f: am 65dea471: am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 
* commit '16dcd64f56fa9032dde2e40978a71aefb7db31ea':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
 2014-09-19 08:39:23 +00:00
Igor Murashkin
bfa819fa7d am 4bf467a1: Merge "camera: Fix missing optional Face fields (eyes, mouth, id)" into lmp-mr1-dev 
* commit '4bf467a1c5b4bdae4881a2553d02c5a061eb74b2':
  camera: Fix missing optional Face fields (eyes, mouth, id)
 2014-09-19 08:39:09 +00:00
Alan Viverette
9a703300df am 4cfd442f: am d78bc33f: am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev 
* commit '4cfd442f6636cfc3b3d13b426b9de3348bb03d56':
  Fix the underlined spinner asset to match text field
 2014-09-19 08:39:01 +00:00
Christoph Studer
365e4c38d5 Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground() 
When services call Service.stopForeground(), remove
FLAG_FOREGROUND_SERVICE from the notification that was supplied
to Service.startForeground().

This enables services to post notifications that become user
dismissable when they switch to being a background service.

Restrict this to targetSdk=L apps to reduce the risk of breaking
existing apps.

Bug: 17551106
Change-Id: Iff8541e5bb2a23ad1fbc9ad80df5fd6eb683148b
 2014-09-19 09:53:12 +02:00
Yohei Yukawa
dc841735cc am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '4654ffdc25931d94ba7658aea7bea6d2a2af9cb9':
  Speculative fix of IMMS crash
 2014-09-19 06:43:26 +00:00
Dan Sandler
8ac58f447f am 030eaabc: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit '030eaabc0d8f06f4453cf2acb60c85a20cf3f0fa':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 06:28:51 +00:00
Yohei Yukawa
2b6307c894 am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash
 2014-09-19 06:21:05 +00:00
Dianne Hackborn
c77063b8fb am 1453241b: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '1453241b1c70205c6b6d73ef5f33bebe6c81e136':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 05:35:10 +00:00
Mike Lockwood
46e6acb35a am ad421a8b: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 
* commit 'ad421a8bedd047366c80ae4338039aec8f5da796':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 05:35:07 +00:00
Alan Viverette
606626f289 am 89b0ec71: am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit '89b0ec71da899b2ce73f88bb5b9ba887aecb022c':
  Always apply window insets to action modes
 2014-09-19 05:35:03 +00:00
Amit Mahajan
8677b698da am 7db61d63: am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit '7db61d632b1e56562ec1feaeda21190d96118579':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 05:34:59 +00:00
Yigit Boyar
6ec30244f0 am 05041606: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '05041606e97abc7c444a55adb4111362b9a3ff89':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 05:34:55 +00:00
Dan Sandler
103daa0c49 am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 05:29:34 +00:00
Yohei Yukawa
d66a7324cc Merge "Speculative fix of IMMS crash" into lmp-dev 2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190 Speculative fix of IMMS crash 
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
 2014-09-19 05:02:59 +00:00
Dianne Hackborn
f2cf16436b am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 04:17:41 +00:00
Mike Lockwood
28c167134b am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 
* commit '52e5e3599151c01a8107f08238ce1c59d8ec2fe1':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 04:17:36 +00:00
Alan Viverette
1b3c0f82ee am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit 'd03ba30bac5d250cdc7d43102dd06af2f114d7a8':
  Always apply window insets to action modes
 2014-09-19 04:09:08 +00:00
Amit Mahajan
e3e1d90e5f am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit '010bdd3c2f68e01ba244baf036b2e952afb99bbf':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 04:09:03 +00:00
Yigit Boyar
6a0c7b1ba8 am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 04:08:55 +00:00
Dan Sandler
20d01ad8a1 Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 2014-09-19 03:32:31 +00:00
Dan Sandler
0c7bb33e03 Fix LayoutInflater copy constructor logic. 
Avoids an NPE in mFilterMap.

Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
 2014-09-18 22:23:32 -04:00
Dianne Hackborn
aad42d1204 Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 2014-09-19 02:01:58 +00:00
Dianne Hackborn
ace27915d2 Fix issue #17564607: Apps in the managed profile can send any intent... 
...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
 2014-09-18 19:01:01 -07:00
Mike Lockwood
51938c205f Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 2014-09-19 02:00:26 +00:00
Michael Wright
8ebac23196 Respect intent-filter priority for system keyboard layouts. 
Bug: 17573945
Change-Id: Id357e199b37ef771c4362c2a5c4ae762071f0042
 2014-09-18 18:48:19 -07:00
w19976
6f006cce75 Handling service number convert while roaming. 
When roaming, change *611 to +19085594899.

Bug: 17202092
Change-Id: Ibd130911131e9ed245cca7130853176f831e361e
 2014-09-19 01:36:15 +00:00
Adam Powell
594558d7e9 Make panel menu windows respect elevation 
Bug 17430536

Change-Id: I962dfa10d3cb4f735dcaa68f17e7ff278d1580a2
 2014-09-18 18:22:29 -07:00
Alan Viverette
3540c462d9 Merge "Always apply window insets to action modes" into lmp-dev 2014-09-19 01:16:22 +00:00
Amit Mahajan
0297ad884d Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 2014-09-19 01:07:23 +00:00
Yigit Boyar
91803838c8 Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 2014-09-19 00:59:53 +00:00
giseok.seo
b907867f68 Fix voice mail number to modify when insert H3G Denmark sim card. 
1.H3G Denmark SIM Card is set to "not available" in UST(Usim service Table) to
  EF_MBDN file of SIM CARD.
  so do not edit voicemail number.

2.AOSP default voicemail number is empty.
  so if inserted H3G Denmark SIM card, User cann't edit voicemail number and
  do not use voicemail service.

Bug: 14093735
Change-Id: I2469ef8e8bda376adcdc9549bf4227bc4c0ddb2e
 2014-09-19 00:59:12 +00:00
Winson Chung
bb08cfcab2 am c164cf2a: am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit 'c164cf2a0c3246e2239a9692739d47ec1478289c':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 00:15:32 +00:00
Winson Chung
7bf2fc5bba am 06ec3d55: am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit '06ec3d5554a099a552dcc563e9d9302d48794179':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 00:15:28 +00:00
Winson Chung
c6858b8e10 am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit '767df884f10be4ad3b7a3e5ae8b97e4ef817e792':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 00:03:58 +00:00
Winson Chung
aab1a058db am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit '5c744b1b01156c37f894619fbe70741435d7ed53':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 00:03:54 +00:00
Winson Chung
56eef1c5c6 Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 2014-09-18 23:50:38 +00:00
Winson Chung
f7dd908171 Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 2014-09-18 23:50:32 +00:00
Yigit Boyar
40c6c555e9 Fix scroll position calculation when clipToPadding is false 
Bug: 17568582
Change-Id: I904450d62c93105db5c61a071c7816278bb441be
 2014-09-18 16:31:52 -07:00
Craig Mautner
dd6ba7d3be am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '888e1a2ec6208e923254fc223800af06aa051a20':
  Don't count finishing activities as effective activities.
 2014-09-18 23:28:57 +00:00
Craig Mautner
879c239d8a am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '992ea04287486759d1cc17a4f18ff96c15bc47c2':
  Don't count finishing activities as effective activities.
 2014-09-18 23:16:19 +00:00