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

152612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a3af75cf5c am 5db573c7: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit '5db573c733367bba7fd05d99632a5f475d7aadda':
  Fix garbage showing up beneath dialogs
 2014-09-19 15:54:01 +00:00
Chris Craik
1f203b3ae6 am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit '969b5ff492aae38fb89c98b2411e217e9b11638e':
  Fix garbage showing up beneath dialogs
 2014-09-19 15:38:31 +00:00
Chris Craik
651486d018 Merge "Fix garbage showing up beneath dialogs" into lmp-dev 2014-09-19 15:31:18 +00:00
Jessica Hummel
8b56ed5a10 am 1174dbb8: am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit '1174dbb86f2c61ea253b4272156e1bf2cc654ae6':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 14:42:47 +00:00
Jessica Hummel
676e7251e0 am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit 'a38239d39e2f71e54352001980863ca81cbbac41':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 14:32:19 +00:00
Jessica Hummel
ccfa1a9799 Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 2014-09-19 14:22:43 +00:00
Paul Jensen
86e0229ca0 am 426aed2a: am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '426aed2ad2c0f9b46cbcd85231c489a2f292b0cf':
  Fix to make repeated lingerings work.
 2014-09-19 12:22:03 +00:00
Paul Jensen
3a4e05d136 am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '2620499ad2dcb2c0891c85ab32f86a5c7823d336':
  Fix to make repeated lingerings work.
 2014-09-19 12:10:53 +00:00
Paul Jensen
7bfa35742a Merge "Fix to make repeated lingerings work." into lmp-dev 2014-09-19 11:59:50 +00:00
Kenny Guy
4f9913e44b am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '8d6b38cdd11e04fadf1a5decf686f2d656770b74':
  Remove suggested key names as its confusing.
 2014-09-19 10:06:25 +00:00
Jessica Hummel
dd31a10c7f bug fix: Allow enableSystemApps to be called by profile and device owner. 
We had an additional check for managed profile in there, so it wasn't working for device owners. Also needed to look at uninstalled packages.

Change-Id: I4813f23b00d7905e92ade582ce082a6f295a322d
Bug: 17384318
 2014-09-19 09:56:19 +00:00
Kenny Guy
57224fae58 am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
  Remove suggested key names as its confusing.
 2014-09-19 09:55:37 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00: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
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
George Mount
5749cc099c am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '48da84681735bde486d3604341eb2aef9e2c7c83':
  Fix broken logic in isValidTarget
 2014-09-18 23:10:55 +00:00
Winson Chung
6b6ed9175b am 65dea471: am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 
* commit '65dea471b7dafeea9241aff47c39324ab844f741':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
 2014-09-18 23:10:51 +00:00
Craig Mautner
6920feedb5 Merge "Don't count finishing activities as effective activities." into lmp-dev 2014-09-18 23:08:25 +00:00