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

113853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
8265343545 am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev 
* commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9':
  Fix Wifi Batch Scanning
 2013-09-12 11:32:32 -07:00
Eino-Ville Talvala
184b17ddef Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 2013-09-12 18:32:29 +00:00
Igor Murashkin
d6b8a4ab4c am ddc74f5e: am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit 'ddc74f5ed1d541ea89964228417eff3d5d6ad071':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:32:28 -07:00
Robert Greenwalt
16666176c0 am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev 
* commit '8f435baca8b5285a6b4658fc9563f5fcbbdafc6e':
  Fix Wifi Batch Scanning
 2013-09-12 11:26:20 -07:00
Igor Murashkin
ddc74f5ed1 am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit '6c62163976844b28859fca322b28af907ec2856d':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:26:16 -07:00
Robert Greenwalt
8f435baca8 Merge "Fix Wifi Batch Scanning" into klp-dev 2013-09-12 18:22:28 +00:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Chet Haase
8529b30b91 Fix TechChange's assumption about TextView targets 
Some of the code in the TextChange transition assumed that the
start values for a transition were for a TextView object. This may
not be the case, and we should return early (without creating an
animator) when it is not.

Issue #10725388 Frequent Framework crashes across apps

Change-Id: I6999eb2288f107f4b93ddb5b77cd068069d831ed
 2013-09-12 11:19:32 -07:00
Adam Powell
d488b785df am 179ba0c0: am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit '179ba0c04b446406d226cdfe866317d0d2bcecce':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:15:43 -07:00
Adam Powell
179ba0c04b am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit 'a2906cb4d9355b7a08e7fdec1924c2dbc7fda622':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:13:58 -07:00
Adam Powell
a2906cb4d9 Merge "Show alternate menu panel on devices with menu key" into klp-dev 2013-09-12 18:12:05 +00:00
Eino-Ville Talvala
d96748b02a Camera2: Add a missing key for controlling shading map mode 
Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1
 2013-09-12 11:11:27 -07:00
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07:00
Chet Haase
913c023387 am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit 'c0f652093ec9dffad23477402ab1cc0a5e415931':
  Add exclude() methods to Transition
 2013-09-12 11:09:26 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Vinit Deshapnde
b20642b999 am 2f2184b7: am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev 
* commit '2f2184b755f995dcf661c383b520e4a36f8a432d':
  Don't restore EAP-TLS networks from backup
 2013-09-12 10:59:42 -07:00
Joe Malin
0329a0ea4a am 7d62664d: am 204df6f0: am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '7d62664d889547468aad7ea3359476a45cc8cab9':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:59:39 -07:00
Vinit Deshapnde
2f2184b755 am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev 
* commit '074dc2eb2da23976bc2916cfe7c61dfcd9977e8f':
  Don't restore EAP-TLS networks from backup
 2013-09-12 10:56:15 -07:00
Joe Malin
7d62664d88 am 204df6f0: am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '204df6f06ad17f0e775fd32fd657cff7d4c4ab7d':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:56:12 -07:00
Vinit Deshapnde
074dc2eb2d Merge "Don't restore EAP-TLS networks from backup" into klp-dev 2013-09-12 17:53:39 +00:00
Joe Malin
204df6f06a am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '7bf74bc04c4e6fa022a84a4e586aca43816ec1f9':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:53:26 -07:00
Svetoslav
c6066799ad Handle print serivce crashes. 
1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce
 2013-09-12 10:52:26 -07:00
Joe Malin
7bf74bc04c am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '1e3a02030949df8c1d1f37a37fc23f25357632f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:51:12 -07:00
Joe Malin
1e3a020309 am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:48:38 -07:00
Joe Malin
6f9e30e3b7 Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 2013-09-12 17:45:05 +00:00
Daniel Sandler
c77a18beca am 22dbb77b: am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit '22dbb77b194536191770a64b4fd7d8df7feb9167':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:41:54 -07:00
Daniel Sandler
22dbb77b19 am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit 'f3da15bde723e6f27ae6b64e8f0765e98b02e45d':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:38:37 -07:00
Daniel Sandler
f3da15bde7 Merge "Remove spurious density-specific default wallpaper." into klp-dev 2013-09-12 17:35:53 +00:00
Joe Malin
72fdbc88bb Android Training: Add Location Testing Lesson 
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
 2013-09-12 10:07:30 -07:00
Amith Yamasani
63a92df82a am 390322a3: am 4d73951a: am c286ae17: Merge "GlobalAction dialog ref not set to null" 
* commit '390322a330e473850c3aa04db21b83de32ba616a':
  GlobalAction dialog ref not set to null
 2013-09-12 10:01:05 -07:00
Amith Yamasani
390322a330 am 4d73951a: am c286ae17: Merge "GlobalAction dialog ref not set to null" 
* commit '4d73951a90d7b9b81146487df5a9d772351d29c1':
  GlobalAction dialog ref not set to null
 2013-09-12 09:49:56 -07:00
Wink Saville
99e7847b76 Define config_volte_replacement_rat. 
Default value is 0 which means there is no replacement and
PhoneProxy#phoneObjectUpdater will not replace a VoLTE RAT.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
 2013-09-12 09:48:55 -07:00
Dirk Dougherty
3333259945 am bf142e6b: am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit 'bf142e6b846d86d4dcf75a51cfb84c2495291bae':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:37:47 -07:00
Dirk Dougherty
bf142e6b84 am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '16dae5997bb0ff7f03d5a0ccfdc4be94aa35ba51':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:33:35 -07:00
Dirk Dougherty
16dae5997b am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '834ba47485a5fb55c89d8f22b826bdb26049f6d6':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:28:18 -07:00
Amith Yamasani
4d73951a90 am c286ae17: Merge "GlobalAction dialog ref not set to null" 
* commit 'c286ae17a02a5ad0b9cb392d5ea2739827919e4c':
  GlobalAction dialog ref not set to null
 2013-09-12 09:27:37 -07:00
Amith Yamasani
c286ae17a0 Merge "GlobalAction dialog ref not set to null" 2013-09-12 16:24:20 +00:00
John Spurlock
0159c6194f am 932c1251: am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '932c1251e412abd8a7555fdf8346bb71defd17d7':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:22:25 -07:00
Jeff Sharkey
d4aa10d5be am c3414dc4: am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit 'c3414dc4baf2bb2c3ef5761912fea7f44d804ebc':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:22:22 -07:00
Dirk Dougherty
834ba47485 am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '4c6cde545c5d2e76d9ba8ef926399463369da7e7':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:22:20 -07:00
Flavio Lerda
9df07d19e3 am 3f36b33d: am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit '3f36b33dca0c1c9599c81b273e88b85d0e6fb06e':
  Document the order of values returned by keyAt().
 2013-09-12 09:22:18 -07:00
Jeff Brown
e5ac84517d am a0908665: am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 
* commit 'a090866557b207efc62197cf7625320babdcaed9':
  Ignore ON_AFTER_RELEASE for partial wake locks.
 2013-09-12 09:22:16 -07:00
Baligh Uddin
2c75bac2de am 0b5fa44b: (-s ours) am 4dff9868: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0b5fa44b246b2cf16f2dc5eea1a09c7a53f6efcd':
  Import translations. DO NOT MERGE
 2013-09-12 09:22:13 -07:00
Baligh Uddin
b6b1872352 am d55c00c9: (-s ours) am c57bd8b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd55c00c93c36358b8dd8abe2d196ef222877db67':
  Import translations. DO NOT MERGE
 2013-09-12 09:22:11 -07:00
Baligh Uddin
d32c8bda1a am 8432e5f0: (-s ours) am 0792054f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8432e5f05c827d48727904996d49086c81ad9562':
  Import translations. DO NOT MERGE
 2013-09-12 09:22:08 -07:00
Alex Ray
f004b0d593 am 0417baa5: am c333a3f7: Merge "consumer_ir: add length to get carrier freqs" into klp-dev 
* commit '0417baa5366e8d11b6ea3f2e1ef14290a99af486':
  consumer_ir: add length to get carrier freqs
 2013-09-12 09:22:03 -07:00
John Spurlock
932c1251e4 am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '43c70b0ccface3e7e0730d9bc0a46b90f16c4b17':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:17:05 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
Flavio Lerda
3f36b33dca am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit 'b25cfdf1ece9163292e2b4c86910fe07b14c0afa':
  Document the order of values returned by keyAt().
 2013-09-12 09:17:00 -07:00
Jeff Brown
a090866557 am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 
* commit '737d2c0b92b69d9069de6fe0e2785676b9a10d78':
  Ignore ON_AFTER_RELEASE for partial wake locks.
 2013-09-12 09:16:57 -07:00