Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,329 Commits 3 Branches 0 Tags
39e04519ca1ecfa2c005394e50e2549979627b7c
Commit Graph

48381 Commits

Author SHA1 Message Date
Nitin Shivpure
39e04519ca am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing 
* commit '305c19412544f7dc5ce38d1f7949f9fc9acf47bd':
  Bluetooth: Fix to avoid framework reboot during monkey testing
 2015-06-02 14:24:58 +00:00
Andre Eisenbach
59a13c46ce am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport 
* commit 'ac00438d00e42f49b1d278bbd0d632e7caeef137':
  Un-hide connectGatt() variant with selective transport
 2015-06-02 14:24:10 +00:00
Ruben Brunk
8b2cf64630 am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev 
* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
  Track camera and flashlight usage in battery stats.
 2015-06-02 14:24:01 +00:00
Clara Bayarri
9ebf752289 am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev 
* commit '8ed46d3f0a3a30414b178b41ea7160bac46ea3d7':
  Fix TextView ActionMode overflow finishes the ActionMode
 2015-06-02 14:23:44 +00:00
Clara Bayarri
dc1630e453 am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev 
* commit '4ebfd76a8975cd90edea06343d6a6aba586712b5':
  Make Text Selection Action Mode secondary items IF_ROOM
 2015-06-02 14:23:39 +00:00
Adam Powell
3fe0c56559 am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev 
* commit '3e03326719f7e4481c3204e834bc1c8fbdfd3466':
  Don't take the compatibility path for non-primary ActionModes
 2015-06-02 14:23:32 +00:00
Svetoslav
f53f3c2432 am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev 
* commit 'fcec13f095186f95bd8483d7ea226944e8913cb4':
  Don't add real children for a view with a node provider
 2015-06-02 14:23:14 +00:00
Jorim Jaggi
b17e96de98 am a60e4b08: am 03a7c4c6: Fix shared drawable state 
* commit 'a60e4b08a0e7d536c930f5455f568d75b558e396':
  Fix shared drawable state
 2015-06-02 14:23:03 +00:00
Selim Gurun
5c40b53370 am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev 
* commit 'e94bc219668b99c010f86bf4742b0b3d477e9d0b':
  Remove ViewAssistStructure and use the frameworks data structure
 2015-06-02 14:22:47 +00:00
Alan Viverette
1a92fc592b am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev 
* commit 'bbc27621b5cb9eee66b254c08a22fd8b148b7b39':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()
 2015-06-02 14:22:40 +00:00
Eino-Ville Talvala
742b4eb890 am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev 
* commit '5665014117a322bdec630adc38cb296195e9086b':
  Camera2: Remove isLoggable
 2015-06-02 14:22:35 +00:00
Jeff Brown
fab99fd899 am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev 
* commit '17fa101c3744dc0834b86f0841cf29bbfd1f6f29':
  Terminate loop properly when cursor window is full.
 2015-06-02 14:22:27 +00:00
Dianne Hackborn
4f57deb990 am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev 
* commit '0d69c19dcdc3df11c28d3981b086c40e94d860be':
  Update VoiceInteractionService from API review.
 2015-06-02 14:21:28 +00:00
Raph Levien
7689a967a7 am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 
* commit 'dcab9a13f7220d4e29ecc18526ee17ccbd3b1b9f':
  Revert "Revert "Use getRunAdvance to position cursor""
 2015-06-02 14:21:07 +00:00
Alan Viverette
9a5b45c1e1 am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev 
* commit '49ceab843872ea562d8deefc54ff86bf6dc3ba5f':
  Clean up AbsListView constructor
 2015-06-02 14:21:01 +00:00
Nitin Shivpure
1f8b844870 Bluetooth: Fix to avoid framework reboot during monkey testing 
When running monkeyrunner, sometimes the framework is disconnected due
to an unhandled Java exception while binding the PAN service (when it
is unsuccessful). Handing the Java exception while binding PAN service
solves this issue.

Change-Id: Idea710593a3f9496305f636042605303e73e7749
 2015-06-02 01:23:11 -07:00
Andre Eisenbach
708f57f4dc Un-hide connectGatt() variant with selective transport 
Change-Id: I1d3c512160de2bd68550faf243bb151d5cf7f3c9
 2015-06-02 02:28:54 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Clara Bayarri
a0b77dd5e2 Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev 2015-06-02 01:15:50 +00:00
Clara Bayarri
d63a177670 Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev 2015-06-02 01:15:03 +00:00
Adam Powell
fa3f17f117 Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev 2015-06-02 01:00:06 +00:00
Svetoslav
4982e7b4dc Merge "Don't add real children for a view with a node provider" into mnc-dev 2015-06-02 00:22:39 +00:00
Svetoslav
762621ced7 Don't add real children for a view with a node provider 
Change-Id: I1dd43fa5ff93e8eb76e2c7587fb13cd1ef097678
 2015-06-01 17:21:59 -07:00
Jorim Jaggi
03a7c4c6d4 Fix shared drawable state 
Not calling mutate here had a side-effect making the icon in the
status bar untintable in SysUI.

Bug: 21566007
Change-Id: Ifb78c81ba7f04d496f14031ef635a6e964e6280e
 2015-06-01 23:59:00 +00:00
Ruben Brunk
6d2c363fd5 Track camera and flashlight usage in battery stats. 
Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
 2015-06-01 16:54:23 -07:00
Selim Gurun
8a6d511dad Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev 2015-06-01 23:53:11 +00:00
Alan Viverette
b0f94ae5d2 Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev 2015-06-01 23:52:36 +00:00
Eino-Ville Talvala
717a2d09fa Merge "Camera2: Remove isLoggable" into mnc-dev 2015-06-01 23:47:32 +00:00
Alan Viverette
376c32f268 Always send VIEW_CLICKED event from AdapterView.performItemClick() 
This makes it consistent with View.performClick().

Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
 2015-06-01 16:41:42 -07:00
Selim Gurun
50b26a5c27 Remove ViewAssistStructure and use the frameworks data structure 
As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated  onProvideVirtualStructure API.

Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7
 2015-06-01 23:41:12 +00:00
Jeff Brown
0505f7f2b5 Merge "Terminate loop properly when cursor window is full." into mnc-dev 2015-06-01 23:34:25 +00:00
Jeff Brown
bb8c841e90 Terminate loop properly when cursor window is full. 
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
 2015-06-01 16:33:24 -07:00
Eino-Ville Talvala
0c4214191f am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit 'a2956f6e059e8565a0f6d48ea3c85cc827bffdb4':
  Camera2: Add tangential distortion coefficients
 2015-06-01 23:22:00 +00:00
Dianne Hackborn
9ed0c4109d Merge "Update VoiceInteractionService from API review." into mnc-dev 2015-06-01 22:28:45 +00:00
Raph Levien
fb2cdc4ca1 Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 2015-06-01 21:56:36 +00:00
Alan Viverette
e0e5c1cf19 Merge "Clean up AbsListView constructor" into mnc-dev 2015-06-01 21:56:36 +00:00
Raph Levien
edb27f14ec Revert "Revert "Use getRunAdvance to position cursor"" 
This reverts commit 5730c97480.
 2015-06-01 14:34:47 -07:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
Raph Levien
590e32212c am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'c73314bcb18f6879bb6f9923912ab38a0c831637':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 20:06:24 +00:00
Raph Levien
cf8b3b1c56 Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 2015-06-01 19:45:43 +00:00
Eino-Ville Talvala
a78791f22a Camera2: Remove isLoggable 
Change-Id: I83b2c8321ab6b48cf68ef7a4d724559ead1a1790
 2015-06-01 12:44:20 -07:00
Raph Levien
5730c97480 Revert "Use getRunAdvance to position cursor" 
This reverts commit cb5499c850.

Bug: 21549197
 2015-06-01 12:40:42 -07:00
Alan Viverette
217974cbe7 am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 
* commit 'c6296a76869422fd698ada889a74bc3129792db5':
  Prevent crash when ColorStateList has unresolved attrs
 2015-06-01 18:51:48 +00:00
Yin-Chia Yeh
ccb8616ab3 am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 
* commit '21f55342d60e54c9e899aa746cf1a848f2910e61':
  Camera2: Add missing LEGACY available keys
 2015-06-01 18:51:43 +00:00
Andres Morales
ab21d60c24 am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit '9250d9727b5a71267cb33b535bdd959c1c03b11a':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 18:51:32 +00:00
Chien-Yu Chen
e573a5e23f am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit 'a56dee8edecddfe298d348c4006de6dea0e92374':
  Camera2: update docs for reprocess timestamp
 2015-06-01 18:51:27 +00:00
Alan Viverette
c820559a91 am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit 'af3134ae74538bf716da8ecdc0a07f29e5bdc145':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 18:51:12 +00:00
Alan Viverette
b88314ad72 am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 
* commit '508b6d2d576b1bdd528362fbb069961a9a65c2fb':
  Fix row/column order when unparcelling CollectionItemInfo
 2015-06-01 18:50:46 +00:00
Stuart Scott
c96a66dd03 am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset. 
* commit '378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 18:50:39 +00:00
Mady Mellor
fae785fccf am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 
* commit '8de52276a1f5faf83ea8147f0ddee74195279bba':
  Update button to BUTTON_STYLUS_PRIMARY
 2015-06-01 18:50:15 +00:00