Jorim Jaggi
526694ea52
resolve merge conflicts of 3c1b0f0 to master
...
Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db
2016-08-03 16:23:28 +00:00
Kirill Grouchnikov
95288e41a5
Merge "Document exception throwing in TabHost"
2016-08-03 13:16:08 +00:00
TreeHugger Robot
ed2e7c894e
Merge "Have BatteryStats track and report the running wakelocks."
2016-08-03 01:49:50 +00:00
Joe Onorato
92fd23fc62
Have BatteryStats track and report the running wakelocks.
...
The times reported are in the screen off / on battery time base.
Bug: 29546924
Change-Id: I025b2959becb256a26cf531e944786d4e9a59149
2016-08-02 17:27:01 -07:00
TreeHugger Robot
391dfcfa68
Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""
2016-08-02 23:56:55 +00:00
Tejas Khorana
81f7c4b6c4
Merge "Account Manager Push API"
2016-08-02 23:29:00 +00:00
Sudheer Shanka
38c67d3c0f
Revert "Add per-user versions of set{Component,Application}EnabledSetting."
...
This reverts commit 0e6bfff6c1
2016-08-02 22:13:17 +00:00
Tejas Khorana
5edff3b8b1
Account Manager Push API
...
Account Push API: Designed to repurpose existing Account Discovery APIs.
Bug#30562311
Bug: https://b.corp.google.com/issues/30562311
Change-Id: If1b22dc96c5cff21550e93bd26942faa5bcdabbf
2016-08-02 14:57:06 -07:00
Jorim Jaggi
ac94b47abe
Only get trace name if tracing is enabled am: 407c0be727
...
am: ca023af1b0
2016-08-02 18:51:26 +00:00
Jorim Jaggi
ca023af1b0
Only get trace name if tracing is enabled
...
am: 407c0be727
2016-08-02 18:40:29 +00:00
John Reck
a25e710181
Fix FrameMetricsObserver crash am: 65ddb154c7 am: 6e30f4c789
...
am: c7a8458205
2016-08-02 18:32:12 +00:00
John Reck
c7a8458205
Fix FrameMetricsObserver crash am: 65ddb154c7
...
am: 6e30f4c789
2016-08-02 18:24:34 +00:00
Makoto Onuki
b3941d2aee
LauncherApps should also throw when user is locked am: 02f338e23d am: 897a4f84d0
...
am: 88870a84ed
2016-08-02 18:24:34 +00:00
John Reck
6e30f4c789
Fix FrameMetricsObserver crash
...
am: 65ddb154c7
2016-08-02 18:15:39 +00:00
Makoto Onuki
88870a84ed
LauncherApps should also throw when user is locked am: 02f338e23d
...
am: 897a4f84d0
2016-08-02 18:15:18 +00:00
Makoto Onuki
897a4f84d0
LauncherApps should also throw when user is locked
...
am: 02f338e23d
2016-08-02 18:03:07 +00:00
Phil Weaver
f546b86584
Reduce extra a11y events when alpha changes. am: 9937f81ac6 am: 2dd6ce7aff
...
am: fc5164a615
2016-08-02 17:56:57 +00:00
Phil Weaver
fc5164a615
Reduce extra a11y events when alpha changes. am: 9937f81ac6
...
am: 2dd6ce7aff
2016-08-02 17:15:20 +00:00
Phil Weaver
2dd6ce7aff
Reduce extra a11y events when alpha changes.
...
am: 9937f81ac6
2016-08-02 17:10:03 +00:00
John Reck
65ddb154c7
Fix FrameMetricsObserver crash
...
Bug: 30587465
Someday maybe the technology will exist to
allow sharing a simple constant between
Java and C++, but today is not that day.
Change-Id: I17694746cb8712058133cd5ea10c47b9909f740b
2016-08-02 09:38:26 -07:00
Kirill Grouchnikov
90ac2ac538
Document exception throwing in TabHost
...
Bug: 30589663
Change-Id: I2dc0ab0fff4d837a85bd1914f99711eca5dd73ca
2016-08-02 11:44:12 -04:00
Jorim Jaggi
407c0be727
Only get trace name if tracing is enabled
...
String formatting creates new objects, so only do it if needed.
Bug: 30549756
Change-Id: I8035357c2b9c3066ef7663b938654f698a2321bc
2016-08-02 11:06:46 +02:00
Robin Lee
35579aa7b4
Merge "Pass userId through to singleton ContentProviders"
2016-08-02 07:55:21 +00:00
Alan Viverette
cf3a479d59
Adjust touch progress offset to account for changes to AbsSeekBar am: 1d33c3f3a3 am: 1cad05bdc0
...
am: c0acf68d30
2016-08-02 02:20:44 +00:00
Svetoslav Ganov
e1c3ca5270
Revert "Prevent apps to overlay other apps via toast windows" am: 2fc661a453
...
am: 74b90c7d85
2016-08-02 02:17:56 +00:00
Svetoslav Ganov
74b90c7d85
Revert "Prevent apps to overlay other apps via toast windows"
...
am: 2fc661a453
2016-08-02 02:01:40 +00:00
Svetoslav Ganov
a2f247e6a6
Merge "Revert "Prevent apps to overlay other apps via toast windows"" into nyc-mr1-dev
2016-08-02 01:56:10 +00:00
Svetoslav Ganov
2fc661a453
Revert "Prevent apps to overlay other apps via toast windows"
...
bug:30150688
This reverts commit dc24f937b0
2016-08-02 01:55:01 +00:00
Makoto Onuki
02f338e23d
LauncherApps should also throw when user is locked
...
otherwise it'd be racy.
Bug 30406401
Change-Id: I953eb6ae58e029d254d9fdbd5d05a0090b8d2391
2016-08-01 18:15:47 -07:00
Phil Weaver
9937f81ac6
Reduce extra a11y events when alpha changes.
...
Changes in alpha only matter if they affect visibility,
so only 0 <-> nonzero changes are worth reporting. Report
them as subtree changes, as visibility affects subviews.
Not reporting every change greatly reduces the number of
event reported when alpha is animated.
Bug: 30183085
Change-Id: I905d53aa81ca8248b3aed86a91842ef499f303a8
2016-08-01 17:41:19 -07:00
Robin Lee
2ab02e2cb2
Pass userId through to singleton ContentProviders
...
System content providers like SettingsProvider run as singleUser but
on receipt of a call make decisions based on the calling user ID.
This is right up until the caller is a system service or a cross-user-
-aware app like Settings, where putStringForUser etc. provide a
workaround for most settings but not for the few files SettingsProvider
exposes.
Change-Id: I90060c9c13e274edd71f8a16ab3a026a58b98e3e
2016-08-01 23:45:36 +01:00
Fyodor Kupolov
9e01f2ace5
Merge \\\"Fix the API compatibility of \\\"UriMatcher#addURI\\\"\\\" am: 3e151273a3 am: bc8d946e09 am: dbf07bb8ef
...
am: 0d287f1846
2016-08-01 22:06:15 +00:00
Makoto Onuki
a31a6f9f27
Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac am: e330d59c2e
...
am: 685091f203
2016-08-01 22:06:08 +00:00
George Mount
921891518a
Merge "Convert BackStackRecord Operations to ArrayList."
2016-08-01 21:44:52 +00:00
Alan Viverette
c0acf68d30
Adjust touch progress offset to account for changes to AbsSeekBar am: 1d33c3f3a3
...
am: 1cad05bdc0
2016-08-01 21:11:00 +00:00
Alan Viverette
1cad05bdc0
Adjust touch progress offset to account for changes to AbsSeekBar
...
am: 1d33c3f3a3
2016-08-01 20:58:10 +00:00
Alan Viverette
7dd40cd411
Merge "Adjust touch progress offset to account for changes to AbsSeekBar" into nyc-mr1-dev
2016-08-01 20:53:50 +00:00
Alan Viverette
1d33c3f3a3
Adjust touch progress offset to account for changes to AbsSeekBar
...
Previously AbsSeekBar always rounded up, which resulted in poor handling
of touches near the edge of a progress value. We fixed this but forgot
to adjust RatingBar for the new behavior.
Bug: 30558586
Change-Id: I634fa7a0b98568093e16279ef5a80abe08d2e2fe
2016-08-01 15:14:05 -04:00
Svet Ganov
a0030632f8
Prevent apps to overlay other apps via toast windows am: dc24f937b0
...
am: fd8ffb62a9
2016-08-01 19:02:53 +00:00
Svet Ganov
fd8ffb62a9
Prevent apps to overlay other apps via toast windows
...
am: dc24f937b0
2016-08-01 18:56:37 +00:00
Svetoslav Ganov
fea7cfce8b
Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev
2016-08-01 18:48:11 +00:00
Svet Ganov
dc24f937b0
Prevent apps to overlay other apps via toast windows
...
It was possible for apps to put toast type windows
that overlay other apps which toast winodws aren't
removed after a timeout.
Now for apps targeting SDK greater than N MR1 to add a
toast window one needs to have a special token. The token
is added by the notificatoion manager service only for
the lifetime of the shown toast and is then removed
including all windows associated with this token. This
prevents apps to add arbitrary toast windows.
Since legacy apps may rely on the ability to directly
add toasts we mitigate by allowing these apps to still
add such windows for unlimited duration if this app is
the currently focused one, i.e. the user interacts with
it then it can overlay itself, otherwise we make sure
these toast windows are removed after a timeout like
a toast would be.
We don't allow more that one toast window per UID being
added at a time which prevents 1) legacy apps to put the
same toast after a timeout to go around our new policy
of hiding toasts after a while; 2) modern apps to reuse
the passed token to add more than one window; Note that
the notification manager shows toasts one at a time.
bug:30150688
Change-Id: Icc8f8dbd060762ae1a7b1720e96c5afdb8aff3fd
2016-08-01 11:46:02 -07:00
Hidehiko Tsuchiya
0d287f1846
Merge \\\"Fix the API compatibility of \\\"UriMatcher#addURI\\\"\\\" am: 3e151273a3 am: bc8d946e09
...
am: dbf07bb8ef
2016-08-01 17:56:38 +00:00
Fyodor Kupolov
dbf07bb8ef
Merge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am: 3e151273a3
...
am: bc8d946e09
2016-08-01 17:50:09 +00:00
Makoto Onuki
685091f203
Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac
...
am: e330d59c2e
2016-08-01 17:47:10 +00:00
Hidehiko Tsuchiya
bc8d946e09
Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
...
am: 3e151273a3
2016-08-01 17:43:30 +00:00
Makoto Onuki
e330d59c2e
Revert \"LauncherApps should also throw when user is locked\"
...
am: 2ec16b08ac
2016-08-01 17:41:55 +00:00
Makoto Onuki
5faa852c57
Merge "Revert "LauncherApps should also throw when user is locked"" into nyc-mr1-dev
2016-08-01 17:30:31 +00:00
Makoto Onuki
2ec16b08ac
Revert "LauncherApps should also throw when user is locked"
...
This reverts commit bc4ad85d29
2016-08-01 17:20:59 +00:00
Jack Yu
ac4ec090bb
Added todo items for a potential metrics issue am: dc5a63bdd1 am: 94f2fe22b4
...
am: c92cb8b816
2016-07-31 03:48:25 +00:00
