Commit Graph

47102 Commits

Author SHA1 Message Date
Adam Skory
26d68e50fa Merge "nullcheck Activity.getIntent() for AssistContent" 2015-04-22 17:59:34 +00:00
Dianne Hackborn
f45e16f2da Merge "Work on issue #20401752: device idle and alarms." 2015-04-22 17:49:39 +00:00
Adam Skory
4aaed145f8 nullcheck Activity.getIntent() for AssistContent
Nothing stopping an Activity from giving us a
null Intent, and the Intent copy constructor
requires a non-null arg.

Bug: 20419159
Change-Id: I8b12a127431869394697e947e2298d4dbbe08604
2015-04-22 11:29:31 -06:00
Andres Morales
6bac04abc9 Merge "Expose getAuthenticatorId API" 2015-04-22 16:56:28 +00:00
Mady Mellor
724866172a Merge "Remove mouse association in scaling, only do it for stylus, update doc." 2015-04-22 16:56:13 +00:00
Andres Morales
4d41a203a0 Expose getAuthenticatorId API
Change-Id: I112c45d596c66e3f6ebd94fecffcb6bb7c3a335a
2015-04-22 16:55:10 +00:00
Craig Mautner
81786701b6 Merge "Add API for putting up locktask pinning toast." 2015-04-22 14:11:08 +00:00
Neil Fuller
52dbaa08cd Merge "Add checks for types in Parcel / avoid class initialization" 2015-04-22 13:30:02 +00:00
Martijn Coenen
3624b170e4 Merge "Add NFC APIs for dynamic resources." 2015-04-22 13:02:06 +00:00
Martijn Coenen
8abf680e00 Add NFC APIs for dynamic resources.
For new Tap & Pay settings UX.

Change-Id: I55ff4e4d4a4b6d26c3c88d96431c4f14d0963323
2015-04-22 11:56:36 +02:00
Andrei Stingaceanu
c649dae8e0 Merge "Cleanup unused icons on the floating toolbar." 2015-04-22 09:25:31 +00:00
Keisuke Kuroyanagi
05fd8d50b2 Stop showing "Replace" when selection isn't inside spans.
Currently, "Replace" is shown when any spans intersects
the selection. It causes confusing behavior when multiple
words are selected. "Replace" is in the ActionBar, but it's
unclear which word will be replaced. It can happen when
text is selected using long tap + drag, unig keyboard, or
using a mouse.

Bug: 19396964
Change-Id: I512f5f566d4060cd0aa7b28594054bf4f6bf7458
2015-04-22 15:33:27 +09:00
Lorenzo Colitti
ac6724b6e5 Merge "Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork" 2015-04-22 04:04:56 +00:00
Lorenzo Colitti
ec4c555571 Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork
The documentation for setProcessDefaultNetwork does not
mention that it requires ACCESS_NETWORK_STATE, but a process
without ACCESS_NETWORK_STATE that calls it will crash because
we can't fetch the proxy properties.

Because ACCESS_NETWORK_STATE is not required to obtain a Network
object (Network objects can come from broadcasts too), it may not
be reasonable to require the permission. We did not do so in L.

For now, ignore the failure and don't crash the app. I've filed
http://b/20470604 to track a longer term fix.

Bug: 20081183
Bug: 20423580
Bug: 20470604
Change-Id: I158016130b4afb1d300357fe703804d2e7bc609b
2015-04-22 12:27:33 +09:00
Tingting Wang
e0aac80b9b Merge "Add MetadataSync table to ContactsContract." 2015-04-22 03:25:56 +00:00
fenglu
b32243498f Merge "update API name to requestBandwidthUpdate()" 2015-04-22 01:32:19 +00:00
Andreas Gampe
0db3cdc59a am 5b0c0964: am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '5b0c0964d843319b1b89767cd3d3f1daa984df51':
  Frameworks/base: Compile-time optimize SQLiteConnection
2015-04-22 00:23:51 +00:00
fenglu
db57147a55 update API name to requestBandwidthUpdate()
Change-Id: If26942978ffcc43f06f17dfad5da790f34758395
2015-04-21 17:12:05 -07:00
Mathieu Chartier
7651dec5c9 am 097e1cdf: am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '097e1cdfb8f3520b22eafb2f0a7458010b1b3415':
  Update getExportedPropertyMethods to new reflection API
2015-04-22 00:00:23 +00:00
Andreas Gampe
fb861b6c8d am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
  Frameworks/base: Compile-time optimize SQLiteConnection
2015-04-21 23:59:57 +00:00
Robert Greenwalt
bba3270c34 Merge "Revert "requestBwUpdate() public API review"" 2015-04-21 23:59:35 +00:00
Robert Greenwalt
2c22a91d4c Revert "requestBwUpdate() public API review"
This reverts commit 32f21da410.

Change-Id: I8c22d285ff1f56f1bd31a0fa9f2e6a79959347b1
2015-04-21 23:59:14 +00:00
Dianne Hackborn
f70faed503 Work on issue #20401752: device idle and alarms.
Main change is to fix problems in the alarm manager where it
was not doing a good job at scheduling the device idle wakeup
before an alarm.  To fix this, we now keep explicit track of
the next "wake from idle" alarm so we can consistently use that
to adjust the time of the device idle alarm if needed.

Also a bunch of debugging stuff to help further diagnose this
problem:

- Alarm summary now includes the last time the alarm went off.
- Improved dumpsys output of alarms.
- New event log tags for changes related to idle state.

Change-Id: Idd2c8d24ae23379f7c75815ddbc6835c2a04656c
2015-04-21 16:59:12 -07:00
Robert Greenwalt
1c7f96f3e8 Merge "requestBwUpdate() public API review" 2015-04-21 23:55:48 +00:00
Tingting Wang
20f14386b8 Add MetadataSync table to ContactsContract.
Sync adapter will modify MetadataSync table to cache the metadata_sync
data from server before it is merged into other CP2 tables.

BUG 20055193

Change-Id: I19d31fc19204444432212cc14c9650d41e075648
2015-04-21 16:39:03 -07:00
Andreas Gampe
31fb202e6f Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 2015-04-21 23:31:51 +00:00
Mathieu Chartier
765d7c3048 am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
  Update getExportedPropertyMethods to new reflection API
2015-04-21 23:26:49 +00:00
Mathieu Chartier
ba6783b69a Merge "Update getExportedPropertyMethods to new reflection API" 2015-04-21 23:03:35 +00:00
Andreas Gampe
4f47b40e05 Frameworks/base: Compile-time optimize SQLiteConnection
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).

Bug: 19498458
Bug: 19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
2015-04-21 16:01:00 -07:00
fenglu
32f21da410 requestBwUpdate() public API review
Change-Id: I1e780b2705d13bfc85a0a8712ac1dbd623b474a1
2015-04-21 15:33:19 -07:00
ztenghui
57c78290e4 Merge "Being extra careful, reset some more variables on ValueAnimator." 2015-04-21 22:13:03 +00:00
Alex Klyubin
d14a15a754 Merge "Document that WebView doesn't honor "uses cleartext traffic" flag." 2015-04-21 22:11:34 +00:00
Alex Klyubin
fbf4599a8e Document that WebView doesn't honor "uses cleartext traffic" flag.
Bug: 19215516
Change-Id: I5dbbaa03f3cae007c0b9b68fcf8cc8f250c16a62
2015-04-21 14:50:39 -07:00
Chris Craik
6eededad96 Merge "More state cleanup in View#draw" 2015-04-21 21:47:27 +00:00
Chris Craik
b309825138 More state cleanup in View#draw
bug:20254728

Change-Id: I988077aac59165dd1fcb3ebbcd5abded586256b5
2015-04-21 14:45:53 -07:00
Christopher Tate
f7cb8a0b50 Compress the preferred-app backup payloads
They can be Very Very Large, so take advantage of the new BlobBackupHelper
infrastructure to keep them tiny!

Also fix an issue in which the restore path wasn't properly passing
notification payloads along for processing, and an issue in which the
blob helper wasn't handling empty states properly.

Change-Id: I11a7ca3cd2e26f634a8971e874ac97385b0b500c
2015-04-21 14:36:22 -07:00
ztenghui
e1b5c2b48a Being extra careful, reset some more variables on ValueAnimator.
No real bug found related to these set of variables yet, just a clean up.

b/20457797

Change-Id: I8443718b1c289ccc87e6b227d417825838277361
2015-04-21 14:20:32 -07:00
ztenghui
fe7cca3d27 Merge "Reset the Node status when clone." 2015-04-21 21:03:12 +00:00
Jeff Brown
a93311f917 Merge "Make activity manager sleep top activity when dreaming." 2015-04-21 20:38:14 +00:00
ztenghui
b1e80d826b Reset the Node status when clone.
b/20457797

Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
2015-04-21 13:00:09 -07:00
Jeff Sharkey
e0ef7e8c60 Merge "Blend in force adoptable flag when set." 2015-04-21 19:45:02 +00:00
Jeff Sharkey
74acbbb2cd Blend in force adoptable flag when set.
Bug: 19993667
Change-Id: Ic7f348d171a89e889281b7efb1aa0cbade048975
2015-04-21 12:18:31 -07:00
Mathieu Chartier
a8a6516f62 Update getExportedPropertyMethods to new reflection API
Bug: 19264997

Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
2015-04-21 11:52:10 -07:00
Jim Miller
93ea09a376 Merge "Make fingerprint enroll/authenticate haptic feedback part of framework." 2015-04-21 17:45:52 +00:00
Dan Sandler
994349c61e Rediscover your own notifications.
This new API, NotificationManager.getActiveNotifications(),
allows an app to recover the set of notifications it has
posted that are still active (un-cleared, un-canceled,
visible by the user). Along with the Notification object
you'll get the original tag and id you used to post it,
wrapped up in the somewhat awkwardly-named
StatusBarNotification data structure (previously only used
internally by NoMan/SysUI and NotificationListenerServices).

Bug: 17320461
Change-Id: I8cd610956fafed4e31526b663cebdc31231ad930
2015-04-21 17:14:17 +00:00
Craig Mautner
c21ae9ed22 Add API for putting up locktask pinning toast.
Fixes bug 18993662.

Change-Id: Ic1753285044857f8ea897784485fd1a9580acf25
2015-04-21 10:11:12 -07:00
Andrei Kapishnikov
8d505ff025 Merge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag" 2015-04-21 16:38:06 +00:00
Chris Craik
2099ee8ab5 Merge "Rename native DisplayListRenderer to DisplayListCanvas" 2015-04-21 16:30:08 +00:00
Joseph Cooper
b201110437 Merge "Introduces navigation keycodes." 2015-04-21 15:31:46 +00:00
Andrei Kapishnikov
4eb6a36922 Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag
A new flag for DPM.resetPassword() method that specifies that the
device should be decrypted without asking for the password or pattern.

Bug 19250601

Related CL in Settings App: https://googleplex-android-review.git.corp.google.com/#/c/670206

Change-Id: I9ca3472dc18e66e618ff772dee16ca4a450e9997
2015-04-21 11:07:09 -04:00