Merge commit 'e5c4725666da25138193bed83831b66b9c0b2c45'
* commit 'e5c4725666da25138193bed83831b66b9c0b2c45':
pass original ptrs to JNI release functions (instead of += index to them)
Fixes conflicting attr IDs due to donut-to-master automerge.
As a side effect, it fixes the "Field android.R.attr.contentAuthority
has changed value from 16843373 to 16843374" error introduced by change
804.
Background:
I submitted two changes to donut that add new public attributes:
https://android-git.corp.google.com/g/Gerrit#change,795https://android-git.corp.google.com/g/Gerrit#change,796
This was fine in donut (though still waiting for build server to
finish), but when auto-merged to master it caused a new build breakage.
This was on top of existing breakage due to
https://android-git.corp.google.com/g/Gerrit#change,804
The problem is that there are now multiple attribute definitions with
identical IDs, as you can see at the bottom of:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blob;f=core/res/res/values/public.xml;h=becc90ef05481321c60301176b91ca7b4553a6d7;hb=master
This did not cause an automerge failure, since my new attributes were
in the "platform 4" section, whereas the new attributes in master were
in the "platform 5" section. It seems like the temporary solution
would be to change the resource IDs in "platform 5" to come after the
ones in "platform 4". But the next time someone adds an attribute in
"platform 4", we will have the same problem. Any ideas?
If this attribute is provided and true, the searchable activity will be
included in any global lists of search targets.
This is needed to support third-party suggestion providers in
global search. See http://b/issue?id=1819651
This lets the searchable activity specify the number of
characters needed to trigger suggestions. Before, this was
hard-coded at 0. This caused unnecessary querying of the
suggestion provider in cases where the provider does not
return suggestions for empty or short queries.
Merge commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd'
* commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd':
TypedProperties: add getStringInfo() to help deal with null strings
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9'
* commit '52a3cb53ddcce049d2e804c3042514df576cb5b9':
TypedProperties: change the file format to be a subset of Java
Merge commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c'
* commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c':
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
* changes:
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
Also adjust based on comments:
+ changed service intent string to conform to usage guidelines
+ only publish the IBackupService binder when invoked with the right
intent action
+ docs tweaks
Also tweak the dataChanged() api to have the client supply a package name. We
don't necessarily TRUST this, but we use it to narrow the set of packages requesting
a backup pass, no longer blithely scheduling a pass for all packages associated
with the caller's uid.
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'
* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
Allow access to global search by pressing the hard search button again
* changes:
Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
within in-app search. If within in-app search and toggled out to global
search, pressing the hard search button will take the user *back* into
in-app search too.
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'
* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
AI 147994: First cut of CharsetUtils, a utility class that aims to
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut
* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
AI 147994: First cut of CharsetUtils, a utility class that aims to
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'
* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
AI 148024: fix NPE when there is no history
