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

150767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
fe2ee96947 am d6ce3e36: am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev 
* commit 'd6ce3e363ea229d4e00946492be2c9d60a2b049b':
  Add FeatureGroup to PackageInfo
 2014-08-16 00:44:55 +00:00
Jeff Sharkey
00eb0dc691 am 870e1f60: am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev 
* commit '870e1f6039b00a4878a01c59e8b407571f6361ba':
  PackageInstaller API refactoring.
 2014-08-16 00:44:50 +00:00
Ihab Awad
07f2134a23 am ec98fe82: am af5e36af: am 578d6c7d: Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev 
* commit 'ec98fe829cda85d1c8647e84ae894fb9a3975695':
  Fix problems with wiring of initializing calls (1/2)
 2014-08-16 00:44:44 +00:00
Robert Greenwalt
305fd05e19 am 5be21366: am 26ca16ce: am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev 
* commit '5be213664688e2751ad6d76a40e9cd7c5823bb6a':
  Configure MTU based on network MTU parameter
 2014-08-16 00:44:23 +00:00
Jeff Davidson
92cfac2c71 am 640e02a6: am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev 
* commit '640e02a644b45cedc76878a2594d51374f2bc7ed':
  Fix default scorer provisioning.
 2014-08-16 00:44:14 +00:00
Jay Shrauner
a6d3cab97b am 65571948: am 42e1f3bf: am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev 
* commit '65571948d93c0fe5e2e1d17fe8cd667f1f93b631':
  Prevent ConcurrentModificationExceptions
 2014-08-16 00:44:09 +00:00
Adam Lesinski
99db87c1ba am afe71dba: am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit 'afe71dba4adb8ad8d07146a1d17211875b42c012':
  Fix assumption about DynamicRefTable in aapt
 2014-08-16 00:44:04 +00:00
Sunny Goyal
c340783a50 am b42afabc: am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit 'b42afabcaf88857acbffc88458278393192a164b':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-16 00:43:53 +00:00
Christopher Tate
c71107b170 am a2f65fd4: am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit 'a2f65fd48d0c018fb2891d6e983472f7bd747f81':
  Tighten restore-at-install behavior
 2014-08-16 00:43:48 +00:00
Justin Mattson
f044e53b45 am 0c694dd1: am 2e502ee5: am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev 
* commit '0c694dd17f128081a92efd56780f5ff8d4589315':
  Add fragment animations to setup leanback theme
 2014-08-16 00:43:28 +00:00
Amith Yamasani
f4146ab007 am 9d579953: am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev 
* commit '9d579953a8b9704f8c43775991be83df7df91b2b':
  Copy certain settings to the managed profile
 2014-08-16 00:43:23 +00:00
Julia Reynolds
34b5930fc3 resolved conflicts for merge of 9ef71fb5 to master 
Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2
 2014-08-15 20:26:42 -04:00
Adam Lesinski
ec620de00c am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev 
* commit '345efd9a6988601e67d3c0202e433144670b5e62':
  Add FeatureGroup to PackageInfo
 2014-08-15 23:16:50 +00:00
Jeff Sharkey
690881325f am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev 
* commit '61c28588f4b8d748c95791446e1ca0ca6f7df060':
  PackageInstaller API refactoring.
 2014-08-15 23:16:45 +00:00
Ihab Awad
6bb00a0e38 am af5e36af: am 578d6c7d: Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev 
* commit 'af5e36af9ddbaf8acf135d3bcdbfc00d327bbeb4':
  Fix problems with wiring of initializing calls (1/2)
 2014-08-15 23:12:28 +00:00
Adam Lesinski
7920573234 am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev 
* commit '58157586ef58387bb1e49930477b8b9c90bb0991':
  Add FeatureGroup to PackageInfo
 2014-08-15 23:10:18 +00:00
Jeff Sharkey
5afc45971a am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev 
* commit 'a1af0d42e47379e83500dbbb1949bf93033f3be6':
  PackageInstaller API refactoring.
 2014-08-15 23:10:13 +00:00
Ihab Awad
ac1dc1add6 am 578d6c7d: Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev 
* commit '578d6c7d3404563a5c62afa4140e1db085c34e06':
  Fix problems with wiring of initializing calls (1/2)
 2014-08-15 23:03:43 +00:00
Robert Greenwalt
18b08ad2b5 am 26ca16ce: am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev 
* commit '26ca16ce704d69e36722786586d8e4449dbabe91':
  Configure MTU based on network MTU parameter
 2014-08-15 22:23:46 +00:00
Robert Greenwalt
2d6c37cd66 am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev 
* commit '90e32866d257e2d3ab66a2c8c59abb179a080797':
  Configure MTU based on network MTU parameter
 2014-08-15 22:16:57 +00:00
Jeff Davidson
f206ab9db3 am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev 
* commit '8450fe3b1ce69a24e373ebca6302739103f1c03b':
  Fix default scorer provisioning.
 2014-08-15 22:08:11 +00:00
Jay Shrauner
e88c570943 am 42e1f3bf: am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev 
* commit '42e1f3bf465e0da059fbb54364580858954a10ed':
  Prevent ConcurrentModificationExceptions
 2014-08-15 22:08:06 +00:00
Adam Lesinski
ab9b1f5b2a am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
  Fix assumption about DynamicRefTable in aapt
 2014-08-15 22:07:59 +00:00
Jeff Davidson
c4f1557ba2 am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev 
* commit 'bffe81a70721acab9e8b912206559cd53725c6c7':
  Fix default scorer provisioning.
 2014-08-15 22:00:58 +00:00
Jay Shrauner
1cfb60f0b5 am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev 
* commit '4a21b277b9ae7087c1dad6c13b50c50d6af7c733':
  Prevent ConcurrentModificationExceptions
 2014-08-15 22:00:53 +00:00
Adam Lesinski
9e4056b7af am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit '2fdf2db8f15a23fea354ecbf4929585dc4c44e5c':
  Fix assumption about DynamicRefTable in aapt
 2014-08-15 21:53:01 +00:00
Sunny Goyal
a4dd2c336f am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit '6ba6c6cecbfe58295c07d6c793aebbc3d9ea2ec2':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-15 21:47:45 +00:00
Christopher Tate
a981cfba7b am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit '5e6afbc2c5dafec254601ac3968a8c26219c91be':
  Tighten restore-at-install behavior
 2014-08-15 21:47:40 +00:00
Sunny Goyal
be55d637d9 am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit 'c49494811aa1ed42c3f0b0519cb037e239f8b0e8':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-15 21:41:11 +00:00
Christopher Tate
1db2391d9f am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit '2c286400bf4913c24dea7d0653314bdf162aaa16':
  Tighten restore-at-install behavior
 2014-08-15 21:41:06 +00:00
Jeff Davidson
cab3eb0c0b Merge "Fix default scorer provisioning." into lmp-dev 2014-08-15 21:23:40 +00:00
Adam Lesinski
91348eb957 Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 2014-08-15 21:23:40 +00:00
Christopher Tate
6cbc07b7c0 Merge "Tighten restore-at-install behavior" into lmp-dev 2014-08-15 21:23:40 +00:00
Justin Mattson
6be7cf6f92 am 2e502ee5: am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev 
* commit '2e502ee519cc6e67921fb249232a502c15fa479d':
  Add fragment animations to setup leanback theme
 2014-08-15 21:17:39 +00:00
Amith Yamasani
38992b95e8 am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev 
* commit 'e52fb6f4df210523946fbc041207438d8264472c':
  Copy certain settings to the managed profile
 2014-08-15 21:17:26 +00:00
Julia Reynolds
cdf03e4c1c am 289bbb2d: am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev 
* commit '289bbb2d827e73893a201f2ecde04f19c86bfc5f':
  Apply lockdowns when user restrictions are set.
 2014-08-15 21:17:05 +00:00
Adrian Roos
f4ba0a2d70 am 633e7a91: am e0a0e0e3: am 384e2274: Fix errors that could lead to brightness flickering 
* commit '633e7a916b48112c0740625829aa8510feab584f':
  Fix errors that could lead to brightness flickering
 2014-08-15 21:11:46 +00:00
Ruchi Kandoi
ca2072c4b3 am cad68989: am eb8012c4: am 1bac45b5: Merge "Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"" into lmp-dev 
* commit 'cad6898960dd3b81427a777608bdd82a9ca316b3':
  Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"
 2014-08-15 21:11:41 +00:00
Chet Haase
e4a7c1706d am d6f4feb0: am e7144508: am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev 
* commit 'd6f4feb09fdfa33ace9373dd88e69ca9b7c5c05c':
  Minor doc fixes from API council recommendations.
 2014-08-15 21:11:35 +00:00
Erik Pasternak
9b4f710618 am eaa45c68: am 93228d99: am b7d0449d: Merge "Add metadata and notifications to OneMedia" into lmp-dev 
* commit 'eaa45c688f582baeb118f399d337d1adadd95de7':
  Add metadata and notifications to OneMedia
 2014-08-15 21:11:30 +00:00
John Spurlock
c71a4bbb70 am 2d89ea02: am c1164b4f: am dcd90bbe: Merge "Zen: tweak audience interruption logic." into lmp-dev 
* commit '2d89ea02f32a4ebffbbb4c86172594b4bb3b8015':
  Zen: tweak audience interruption logic.
 2014-08-15 21:11:26 +00:00
RoboErik
97a837389b am a955d872: am 4ed18b42: am 9ea4316f: Merge "Fix crash in legacy apps that register without a looper" into lmp-dev 
* commit 'a955d8721edbd5f7355fe7c95dad721e03a19ac1':
  Fix crash in legacy apps that register without a looper
 2014-08-15 21:11:20 +00:00
Narayan Kamath
8da7810224 am 0f575a9e: am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 
* commit '0f575a9e65ee1baa0edcde2e8eaa123958c47870':
  Fix getPackageInfo for the "android" package in the system server.
 2014-08-15 21:11:16 +00:00
Justin Mattson
d3077b95f8 am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev 
* commit 'f6c0767d46d5f42129a760c705ad0cb6e1e2fbe6':
  Add fragment animations to setup leanback theme
 2014-08-15 21:03:06 +00:00
Adam Lesinski
2cb761e3dd Fix assumption about DynamicRefTable in aapt 
Packages without any resources should not expect to have
a DynamicRefTable.

Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
 2014-08-15 14:01:43 -07:00
Adrian Roos
78c5c9721c am e0a0e0e3: am 384e2274: Fix errors that could lead to brightness flickering 
* commit 'e0a0e0e364e2fa37b1a9a8f27a7d612257b1f1a0':
  Fix errors that could lead to brightness flickering
 2014-08-15 20:59:27 +00:00
Ruchi Kandoi
1fb09ae4a5 am eb8012c4: am 1bac45b5: Merge "Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"" into lmp-dev 
* commit 'eb8012c4811293d47258e1ea6fe69333ff999728':
  Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"
 2014-08-15 20:59:14 +00:00
Chet Haase
4829093924 am e7144508: am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev 
* commit 'e7144508762507a69e6516d29e39c134c782bdb7':
  Minor doc fixes from API council recommendations.
 2014-08-15 20:59:09 +00:00
Erik Pasternak
102723b899 am 93228d99: am b7d0449d: Merge "Add metadata and notifications to OneMedia" into lmp-dev 
* commit '93228d992c30bbe6503bbf6866173203963fe9a4':
  Add metadata and notifications to OneMedia
 2014-08-15 20:59:01 +00:00
John Spurlock
8d87a7fd9c am c1164b4f: am dcd90bbe: Merge "Zen: tweak audience interruption logic." into lmp-dev 
* commit 'c1164b4f56eabe8ecec1f1f3cedafa4c10edd502':
  Zen: tweak audience interruption logic.
 2014-08-15 20:58:55 +00:00