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

162952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
032a69bc96 Merge "Import translations. DO NOT MERGE" 2014-09-19 15:41:56 +00:00
Jessica Hummel
d47cb0e75f am c8dd3c42: am d0c8873b: am d5021775: am 1174dbb8: am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit 'c8dd3c42c3e8591242bb2f9820e6504b39df222f':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 15:16:05 +00:00
Jessica Hummel
82caa19dc8 am d0c8873b: am d5021775: am 1174dbb8: am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit 'd0c8873b29bc14b6962f3f275a1be0fe6df9bd24':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 15:06:05 +00:00
Jessica Hummel
c88557b325 am d5021775: am 1174dbb8: am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit 'd5021775aebeac61761b87088382cf616310b5df':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 14:53:16 +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
7af0254d37 am 69dc47d1: am 329de28a: am 3c062bf5: am 426aed2a: am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '69dc47d1e809472666537c1515ea6f8426ee5086':
  Fix to make repeated lingerings work.
 2014-09-19 13:40:51 +00:00
Kenny Guy
580c8675be am e83001aa: am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit 'e83001aaea1a8c63dc86d1c63d243a97441b6a3e':
  Remove suggested key names as its confusing.
 2014-09-19 13:40:47 +00:00
Paul Jensen
d3e90449bd am 329de28a: am 3c062bf5: am 426aed2a: am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '329de28ae3299ea36a86a5d1106234d9bf6bb1b3':
  Fix to make repeated lingerings work.
 2014-09-19 13:27:01 +00:00
Kenny Guy
4b34d39ebd am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '86d6e75144097fe6be741c2ac0756a82c98d3dc7':
  Remove suggested key names as its confusing.
 2014-09-19 13:26:56 +00:00
Paul Jensen
b02997ea38 am 3c062bf5: am 426aed2a: am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '3c062bf531323e4c4ca2f5ac90819df073d30c79':
  Fix to make repeated lingerings work.
 2014-09-19 12:31:47 +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
48a9928ec7 am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '2d4024d9caa6b75096f5ae88b5319c9b78e3ffcf':
  Remove suggested key names as its confusing.
 2014-09-19 10:16:47 +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
Yohei Yukawa
17d9686873 am 839eb7af: am 227fc315: am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '839eb7afa34ccfb46edf1eb6706608f33978b8df':
  Speculative fix of IMMS crash
 2014-09-19 09:44:30 +00:00
Dan Sandler
0cd30f7702 am 881a594d: am 4cd7746c: am b2811608: am 030eaabc: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit '881a594d342e4250be7dbcc401665f210b34384f':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 09:44:25 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Dianne Hackborn
306654605f am 7b7d23e6: am 186b584e: am 80113a79: am 1453241b: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '7b7d23e611887db220577ded024d5b533fd031cf':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 09:44:21 +00:00
Mike Lockwood
6d72b73768 am 8d6a74e0: am b4b95714: 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 '8d6a74e0c8a7ceead76dcaf3d17784302f9f78fe':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 09:44:17 +00:00
Alan Viverette
4097edf482 am 99e83945: am df7f8e24: am 4ed54216: am 89b0ec71: am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit '99e839450bd00986dbd5e23794fba97638440ebc':
  Always apply window insets to action modes
 2014-09-19 09:44:13 +00:00
Amit Mahajan
db35988232 am 6acdb24a: am c590aa2c: am 4b797fd9: am 7db61d63: am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit '6acdb24a3fe9f60364ba22b76852459a49c5a5ef':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 09:44:09 +00:00
Yigit Boyar
0b62efdf96 am 07617442: am 914d2094: am 4a7c96d4: am 05041606: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '07617442eb75fada60593860f1ea67a8021764ba':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 09:44:05 +00:00
Winson Chung
55e8c21c0e am 3bf058e9: am c082736d: am d7eb771e: am c164cf2a: am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit '3bf058e9b1e0432a048e49886e8fb4efe217e13b':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 09:43:50 +00:00
Winson Chung
e52dd5f59b am 5d5de0f2: am 76418f9d: am 0dd9add1: am 06ec3d55: am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit '5d5de0f2ac3f83bc8e1d0fdc14fa6db83884bb9a':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 09:43:45 +00:00
Craig Mautner
3b8ec6df43 am 12d0cc5d: am 44895a9a: am 4e349966: am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '12d0cc5d987aaf84d9f11f541008e4e6d06fa275':
  Don't count finishing activities as effective activities.
 2014-09-19 09:43:41 +00:00
George Mount
064823b8f8 am 6c4ec74c: am 93b49f02: am 91cba7d9: am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '6c4ec74c8067006442fe1c422d32bf961e4e42fc':
  Fix broken logic in isValidTarget
 2014-09-19 09:43:37 +00:00
Winson Chung
dd7d856d3d am b3e47a79: am e67639ef: am 16dcd64f: am 65dea471: am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 
* commit 'b3e47a7964520b212232762338ff636688d72b43':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
 2014-09-19 09:43:32 +00:00
Igor Murashkin
de060ec926 am 6f389c3f: am bf7bd5ed: am 4bf467a1: Merge "camera: Fix missing optional Face fields (eyes, mouth, id)" into lmp-mr1-dev 
* commit '6f389c3f196ddd7a8d7efb981965f7bd9b1ca022':
  camera: Fix missing optional Face fields (eyes, mouth, id)
 2014-09-19 09:43:28 +00:00
Alan Viverette
1f7e28dfc1 am a12f5dab: am 1b757c08: am 4cfd442f: am d78bc33f: am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev 
* commit 'a12f5dab3c32955961525aa962c462df80ed6e8c':
  Fix the underlined spinner asset to match text field
 2014-09-19 09:43:21 +00:00
Yohei Yukawa
95e6316f93 am 227fc315: am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '227fc315686c5d119b5d76ae90148c3c4a9dfbe8':
  Speculative fix of IMMS crash
 2014-09-19 09:30:30 +00:00
Dan Sandler
245e863f47 am 4cd7746c: am b2811608: am 030eaabc: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit '4cd7746caf62b9c0628dafe8e4a864f9d3c0cc8d':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 09:30:26 +00:00
Dianne Hackborn
1a50ba057d am 186b584e: am 80113a79: am 1453241b: am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '186b584e5f9d7dc1d0320e159a4ac51d59fb1eea':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 09:30:13 +00:00
Mike Lockwood
15b3c63386 am b4b95714: 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 'b4b957144368a23cd916b7d7f5656141b7cb0dae':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 09:30:08 +00:00
Alan Viverette
ec9f3fdb68 am df7f8e24: am 4ed54216: am 89b0ec71: am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit 'df7f8e2447323e918bace1ff03349f1432d6c729':
  Always apply window insets to action modes
 2014-09-19 09:30:03 +00:00
Amit Mahajan
e81a195ca7 am c590aa2c: am 4b797fd9: am 7db61d63: am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit 'c590aa2c0e3711a6c5bc9bec54a9e8432b8c7550':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 09:29:59 +00:00
Yigit Boyar
f1a094c9e1 am 914d2094: am 4a7c96d4: am 05041606: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '914d2094d52804dd80a65f2a07656da7c6108a7c':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 09:29:55 +00:00
Winson Chung
a8c50be80b am c082736d: am d7eb771e: am c164cf2a: am 767df884: Merge "Try and bind search widget before initial calculations of transition rects. (Bug 17456094)" into lmp-dev 
* commit 'c082736df18fc1af23a785cac3890f514ac0a9ec':
  Try and bind search widget before initial calculations of transition rects. (Bug 17456094)
 2014-09-19 09:29:50 +00:00
Winson Chung
9a5edba033 am 76418f9d: am 0dd9add1: am 06ec3d55: am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev 
* commit '76418f9dc48ac80acabcf9e63302fb2ee326a13a':
  Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
 2014-09-19 09:29:45 +00:00
Craig Mautner
f9f0380f6d am 44895a9a: am 4e349966: am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev 
* commit '44895a9a80ab6314640eccb9a3b830b6649cfcff':
  Don't count finishing activities as effective activities.
 2014-09-19 09:29:40 +00:00
George Mount
bf4ba8b31d am 93b49f02: am 91cba7d9: am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '93b49f02105014acfcd769f0ec643c15abc4283e':
  Fix broken logic in isValidTarget
 2014-09-19 09:29:35 +00:00
Winson Chung
3ee0d33257 am e67639ef: am 16dcd64f: am 65dea471: am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev 
* commit 'e67639ef30ba5e8bd9ec9ef34a5d47630fcadd3b':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
 2014-09-19 09:29:30 +00:00
Igor Murashkin
fb6bc257cd am bf7bd5ed: am 4bf467a1: Merge "camera: Fix missing optional Face fields (eyes, mouth, id)" into lmp-mr1-dev 
* commit 'bf7bd5edf4164ed5d65172ea8402c33f4b68c680':
  camera: Fix missing optional Face fields (eyes, mouth, id)
 2014-09-19 09:29:25 +00:00
Alan Viverette
47484ba682 am 1b757c08: am 4cfd442f: am d78bc33f: am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev 
* commit '1b757c088eec62bfd0c31defc834dfe458e84334':
  Fix the underlined spinner asset to match text field
 2014-09-19 09:29:21 +00:00
Yohei Yukawa
ebce33ae1b am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit 'c20c4ab7f4a811c4d6e5be05d117cdf9650149f5':
  Speculative fix of IMMS crash
 2014-09-19 08:41:36 +00:00
Dan Sandler
e1dcf5a851 am b2811608: am 030eaabc: am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'b2811608b31d8145ec0814a10c783d4d0faecbb4':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 08:41:31 +00:00