Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,804 Commits 3 Branches 0 Tags
a94db2467cdc03929c2fc97bf3b451c51a421873
Commit Graph

34090 Commits

Author SHA1 Message Date
Igor Murashkin
a94db2467c am 76f883e0: am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 
* commit '76f883e0a8fa6d62110824399440c779a1b68874':
  Binder: Log exceptions originating from the binder stub for oneway calls
 2013-09-06 13:46:16 -07:00
Igor Murashkin
76f883e0a8 am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 
* commit '034052b352e14054d5271ea42985497f6b101b4f':
  Binder: Log exceptions originating from the binder stub for oneway calls
 2013-09-06 13:38:23 -07:00
Adam Powell
0cb1a791d8 am 435f957f: am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 
* commit '435f957feef58a4d393f06f57db3975633d6b09b':
  Add a minimum timeout for double-tap in GestureDetector
 2013-09-06 13:32:51 -07:00
Adam Powell
435f957fee am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 
* commit 'b8b017cb6879352aee015ba24e9bfd05cc094e74':
  Add a minimum timeout for double-tap in GestureDetector
 2013-09-06 12:58:24 -07:00
Igor Murashkin
034052b352 Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 2013-09-06 18:32:30 +00:00
Adam Powell
b8b017cb68 Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 2013-09-06 18:15:28 +00:00
Jeff Sharkey
a53fb42f31 am 775bdbdb: am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev 
* commit '775bdbdb11ad790f45ee66e8fdf8dca3fcba969a':
  Provide calling package to ContentProviders.
  Separate root and document management.
 2013-09-06 09:53:04 -07:00
Wink Saville
010bbf42ff am 78f4e10b: am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '78f4e10bb206acc13095a6daeb880751fb28f313':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:53:01 -07:00
Mikhail Naganov
1b48d039d3 am 708d279a: am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev 
* commit '708d279a16e2c937da1a2247195eb738906c199e':
  Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
 2013-09-06 09:52:49 -07:00
Michael Wright
6484c0e013 Merge addition of supports-input tag into master 
aapt has been moved out of f/b which caused merged conflicts in
the original commit

Conflicts:
	tools/aapt/Command.cpp

Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b
 2013-09-06 09:39:34 -07:00
Jeff Sharkey
775bdbdb11 am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev 
* commit 'dc8d704899716e97e59af8b6fe5f549e0229eda6':
  Provide calling package to ContentProviders.
  Separate root and document management.
 2013-09-06 09:29:05 -07:00
Jeff Sharkey
dc8d704899 Merge changes I7277880e,Ia5584bd6 into klp-dev 
* changes:
  Provide calling package to ContentProviders.
  Separate root and document management.
 2013-09-06 16:26:34 +00:00
Wink Saville
78f4e10bb2 am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit 'a1d6a9b474ba095860838c6ed3e72f8d9f5058cd':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:25:32 -07:00
Wink Saville
a1d6a9b474 am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit 'fc7a146b82774514bad4bc307489ece7ac27ee50':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:19:40 -07:00
Wink Saville
fc7a146b82 am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:17:19 -07:00
Wink Saville
50f864480d am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '59a9884bf8280e2db9db7680370e98f40a065d56':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:12:50 -07:00
Matthew Williams
abc1d89950 Merge "Fix broken javadocs" 2013-09-06 16:06:17 +00:00
Jeff Sharkey
911d7f411f Provide calling package to ContentProviders. 
The calling package is important for ContentProviders that want to
grant Uri permissions as a side effect of operations, so offer it
through a new API.  Validates the provided package against the
calling UID before returning.

Bug: 10626527
Change-Id: I7277880eebbd48444c024bcf5f69199133cd59e4
 2013-09-06 08:08:18 -07:00
Jeff Sharkey
a61dc8e03e Separate root and document management. 
Two hidden intents for managing roots and documents, used to support
Downloads UI.  Touching an item tries launching as MANAGE_DOCUMENT
first before falling back to VIEW.  Provide MIME type for roots.

Bug: 10446265, 10531347, 10599641
Change-Id: Ia5584bd6ce3e5a9b0048e8caf1447e3053664413
 2013-09-06 08:08:18 -07:00
Mikhail Naganov
708d279a16 am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev 
* commit '498a5f5488446e1d5914f5d335ee02572c6201d1':
  Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
 2013-09-06 07:41:08 -07:00
Mikhail Naganov
498a5f5488 Merge "Add more docs for WebView's setInitialScale and setLoadWithOverviewMode" into klp-dev 2013-09-06 14:36:29 +00:00
Alan Viverette
589759ff1d am 47361ddd: am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 
* commit '47361ddd0a507c687bc92b2d5baeae221a2df493':
  Apply implicit parent dependency when adding to PreferenceGroup
 2013-09-05 23:52:12 -07:00
Lorenzo Colitti
db8b920fe9 am cf712202: am a7597d17: Merge "Add a function to replace all the link addresses." into klp-dev 
* commit 'cf71220223a4c4c7f2ac1e3340c8aa0cffa5f4cf':
  Add a function to replace all the link addresses.
 2013-09-05 23:51:53 -07:00
Michael Wright
f17e8ee379 am 86974463: Merge "Added support for supports-input manifest element" into klp-dev 
* commit '86974463e9e28108e14fa255efd3c429358c0605':
  Added support for supports-input manifest element
 2013-09-05 18:31:04 -07:00
Michael Wright
86974463e9 Merge "Added support for supports-input manifest element" into klp-dev 2013-09-06 01:29:35 +00:00
Michael Wright
eaeb190486 Added support for supports-input manifest element 
Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
 2013-09-05 18:15:57 -07:00
Amith Yamasani
cd57b4950f am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit '3d27c9f973b1dd35ed457785b452851316cdca8a':
  Remove unused APIs and rename others based on API review
 2013-09-05 17:33:19 -07:00
Alan Viverette
47361ddd0a am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 
* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup
 2013-09-05 16:40:39 -07:00
Alan Viverette
0ccef4d003 Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 2013-09-05 23:36:18 +00:00
Lorenzo Colitti
cf71220223 am a7597d17: Merge "Add a function to replace all the link addresses." into klp-dev 
* commit 'a7597d17714e8aa975a4692cd7e9656d8bfa2e2c':
  Add a function to replace all the link addresses.
 2013-09-05 16:06:12 -07:00
Lorenzo Colitti
a7597d1771 Merge "Add a function to replace all the link addresses." into klp-dev 2013-09-05 23:03:24 +00:00
Matthew Williams
56dbf8f236 Fix broken javadocs 
Change-Id: Ibf7f2ed92919efd36fffa963447b1a443c0bb9db
 2013-09-05 15:58:24 -07:00
Amith Yamasani
3d27c9f973 am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit 'f1eebfc2cf47b7fb6ed8dfd06fb124f78ca3519e':
  Remove unused APIs and rename others based on API review
 2013-09-05 15:51:34 -07:00
Amith Yamasani
f1eebfc2cf Merge "Remove unused APIs and rename others based on API review" into klp-dev 2013-09-05 22:48:17 +00:00
Dianne Hackborn
a914574389 am 0421cfd2: am a6c767b2: Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev 
* commit '0421cfd2509766ddbd8cc789dc3ae831def9d003':
  Fix issue #10491028: iabv2 test apps that contain subscription SKUs...
 2013-09-05 15:26:40 -07:00
Dianne Hackborn
0421cfd250 am a6c767b2: Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev 
* commit 'a6c767b2d8239a80c53577ce59daea3001ab0bce':
  Fix issue #10491028: iabv2 test apps that contain subscription SKUs...
 2013-09-05 15:23:58 -07:00
Dianne Hackborn
a6c767b2d8 Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev 2013-09-05 22:20:55 +00:00
Dianne Hackborn
8fd3751be2 Fix issue #10491028: iabv2 test apps that contain subscription SKUs... 
...crash on launch

You got some values in my keys!

Change-Id: I2636c72843e0c0900ccdd9acba771c1b61e70b39
 2013-09-05 15:10:20 -07:00
Kenny Root
b5e40a2555 am e968a479: am 040e68f0: Merge "Add argument to binder call to check key types" into klp-dev 
* commit 'e968a4796bc589fee6fb988cd14a86a538b4cf2c':
  Add argument to binder call to check key types
 2013-09-05 14:48:50 -07:00
Kenny Root
e968a4796b am 040e68f0: Merge "Add argument to binder call to check key types" into klp-dev 
* commit '040e68f02639048f76dcba2fcefbd43152697690':
  Add argument to binder call to check key types
 2013-09-05 14:45:10 -07:00
Kenny Root
040e68f026 Merge "Add argument to binder call to check key types" into klp-dev 2013-09-05 21:40:56 +00:00
Jeff Sharkey
372750aa6f am c7b2112f: am 5d7acbd8: Merge "Filter roots based on supported MIME types." into klp-dev 
* commit 'c7b2112f1ba34013fafba69cd64e9b7aabc41fa6':
  Filter roots based on supported MIME types.
 2013-09-05 14:26:27 -07:00
Jeff Sharkey
c7b2112f1b am 5d7acbd8: Merge "Filter roots based on supported MIME types." into klp-dev 
* commit '5d7acbd8bedbccfd64d9d790d0b3c2492acdc219':
  Filter roots based on supported MIME types.
 2013-09-05 14:23:56 -07:00
Jeff Sharkey
5d7acbd8be Merge "Filter roots based on supported MIME types." into klp-dev 2013-09-05 21:19:39 +00:00
Jeff Sharkey
923396b772 Filter roots based on supported MIME types. 
Using flags to indicate supported types isn't very extensible, so
use newline-separated MIME types instead.

Bug: 10514613
Change-Id: I45641fc20b423b2a0bb2df7457c274f42aa6861a
 2013-09-05 13:58:04 -07:00
Adam Powell
af1785f0b5 Add a minimum timeout for double-tap in GestureDetector 
Prevent noisy falsing. Minimum timeout is currently 40ms and can be
tuned for later. Consider un-hiding the ViewConfiguration query method
later.

Bug 10476944

Change-Id: Ib470735ec929b0b358fca4597e92dc81084e675f
 2013-09-05 13:44:45 -07:00
Dianne Hackborn
9bf60233bc am 8e535cec: am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 
* commit '8e535cec2e172fc08e2d9c98bb3fb1c66e5552c7':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
 2013-09-05 13:43:54 -07:00
Dianne Hackborn
8e535cec2e am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 
* commit 'dfafaffe8601a3483e8da8f32bd4c754fecb88c1':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
 2013-09-05 13:40:42 -07:00
Dianne Hackborn
dfafaffe86 Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 2013-09-05 20:38:55 +00:00
Alan Viverette
651b4249b9 Apply implicit parent dependency when adding to PreferenceGroup 
BUG: 10493706
Change-Id: Iba741d8dd4e72bc5aef5c033e42a9ba4fb0c523b
 2013-09-05 13:32:40 -07:00