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

43563 Commits

Author SHA1 Message Date
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
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
Baligh Uddin
f96b104a7f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-06 04:56:22 +00: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
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
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
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
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
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
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
Kenny Root
b91773bce1 Add argument to binder call to check key types 
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

Bug: 10600582
Change-Id: I9fe9e46b9ec9cfb2f1246179b2c396216b2c1fdb
 2013-09-05 13:27:00 -07:00
Dianne Hackborn
f691359724 Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put 
Locking of sSharedPrefs was bad -- it was using a per-context lock
instead of a static lock.

Change-Id: Ib261a40619c43f7ea2e686057c0702fb5461d843
 2013-09-05 13:21:24 -07:00
Svetoslav
4063e9e732 am 0cdc24a2: Merge "Bug fixes in the print dialog" into klp-dev 
* commit '0cdc24a2fb5268241cf16c6b28a4a3b58965a2c8':
  Bug fixes in the print dialog
 2013-09-05 12:39:37 -07:00
Adam Powell
f094655c80 am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev 
* commit 'a73c3a54886c302cc72e469d27603ef6bb92a6a1':
  Add View#cancelPendingInputEvents API
 2013-09-05 12:39:34 -07:00
Svetoslav
0cdc24a2fb Merge "Bug fixes in the print dialog" into klp-dev 2013-09-05 19:38:24 +00:00
Adam Powell
a73c3a5488 Merge "Add View#cancelPendingInputEvents API" into klp-dev 2013-09-05 19:37:51 +00:00
Wink Saville
67c3821926 Do not change NetworkInfo.DetailedState. 
I'd changed DetailedState to force ConnectivityService to treat
provisioning apn's specially. In particular so that they wouldn't
be identified they were fully connected until the provisioning
actually started. The problem is that DetailedState is a public enum
that has a CTS test and just changing the CTS to allow for the new
state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate.

Instead I've added a new mIsConnectedToProvisioningNetwork variable
and used the DetailedState.SUSPENDED as the intermediate state.

Bug: 10620248
Change-Id: Id4a842398cad67455541ce629959351c27d83639
 2013-09-05 12:02:25 -07:00
Svetoslav
a36285f3f2 Bug fixes in the print dialog 
1. Read/write async tasks of the persistence manger used by
   the FusedPrintersProvider could be run more that once, so
   create a new one every time.

2. The fake printer used to save to PDF should not be added
   to printer history.

3. Removed print preview leftover code from the print dialog.

4. Save to PDF was not working on the second consecutive attempt.

5. The fisrt time the orientation change was ignored - regression

Change-Id: I8960ef2cf92dfeeec22fa8751ba8475092b5b65c
 2013-09-05 11:34:32 -07:00
Vinit Deshapnde
76998d552c am b402fb2f: Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev 
* commit 'b402fb2fddbee48ef3b518358dc5c86db63f7780':
  Rename LinkInfo to LinkQualityInfo
 2013-09-05 10:53:16 -07:00
Vinit Deshapnde
b402fb2fdd Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev 2013-09-05 17:50:19 +00:00
Mikhail Naganov
003033665f Add more docs for WebView's setInitialScale and setLoadWithOverviewMode 
BUG=10588746

Change-Id: Ibbccd688de9841cc780b933f414a8435c79b51b3
 2013-09-05 18:13:07 +01:00
Chet Haase
04f3150160 am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev 
* commit 'a9fa33b366e82f330ec8a68b616896876e7ddc46':
  Change build version from KEY_LIME_PIE to KITKAT
 2013-09-05 10:10:39 -07:00
Chet Haase
a9fa33b366 Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev 2013-09-05 17:07:30 +00:00
Svetoslav
e2144155f6 am 2def6148: Merge "Hiding some unneeded APIs," into klp-dev 
* commit '2def61485413084e68233c89ba956a2282fbacd1':
  Hiding some unneeded APIs,
 2013-09-05 10:03:47 -07:00
Svetoslav
2def614854 Merge "Hiding some unneeded APIs," into klp-dev 2013-09-05 17:01:39 +00:00
Svetoslav
a76233ae84 Hiding some unneeded APIs, 
1. Hide the MediaSize and Resolution constructors that take
   package and resource Id.

2. Fix a bug and docs in creating portrait and landscape media
   size.

Change-Id: If59992e355391de6ad6d14d4f7b3be8c8b6cc0e0
 2013-09-05 09:50:28 -07:00
Amith Yamasani
d304af6989 Remove unused APIs and rename others based on API review 
Restrictions challenge is only to be used by device admins.

Bug: 10461761
Change-Id: I3db1249e2ce99f386602de59ed930302bb0a97fb
 2013-09-05 09:30:23 -07:00
Chet Haase
e8222dddaf Change build version from KEY_LIME_PIE to KITKAT 
Issue #10631619 Change build version to KitKat

Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b
 2013-09-05 08:44:33 -07:00
Baligh Uddin
a638c19a49 Import translations. DO NOT MERGE 
Change-Id: Ic158d7757255f1ede505df96c54e66c89a44ef17
Auto-generated-cl: translation import
 2013-09-05 08:29:59 -07:00