Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
83160236a5 Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe 
am: 02082ad631

* commit '02082ad6317d1b53c35b8e6239d4c41dedd5533a':

Change-Id: I3f8dd98e2fb7c38e6cd53741806e5aa6b6c547ed
 2016-06-02 22:26:59 +00:00
Svetoslav Ganov
b625e19a87 Properly set default voice interactor 
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.

bug:28963642

Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
 2016-06-02 15:25:15 -07:00
Android Build Merger (Role)
93032d94f7 Merge "Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe am: a80c867adf" into nyc-mr1-dev-plus-aosp 2016-06-02 22:22:56 +00:00
Jorim Jaggi
2609c125ed Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe 
am: a80c867adf

* commit 'a80c867adf9f2a19cb2d955e9594e5dda4840d26':
  Fix unminimizing dock stack for AppTask.moveToFront

Change-Id: Id6b6296e7591307a54d685ff2d35e1ae85591512
 2016-06-02 22:22:34 +00:00
Billy Lamberta
983378a916 docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed am: a092b6cdb9 am: 24b4156861 
am: 3913df1e81

* commit '3913df1e81e6fdb11ffe07e7053d62b09fe4b690':
  docs: work minisite post-launch fixes

Change-Id: Ieb0ceae32681e90d017f2388340cac2f2be960ce
 2016-06-02 22:22:27 +00:00
Android Build Merger (Role)
64a2480f6c Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am: 84c074adb2" into nyc-mr1-dev-plus-aosp 2016-06-02 22:22:16 +00:00
Robert Greenwalt
37409c5747 Add support for UNSOL PCO Data. 
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
 2016-06-02 15:21:59 -07:00
Annie Chin
2c446e0a64 Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev 
am: 84c074adb2

* commit '84c074adb251135554f0ce1133ab7ec5d9c4aded':
  Remove SystemUIFactory.getHomeLayoutId()

Change-Id: Iba4ea97d2e92a81fe355a3342e9a8cd7b134d0b5
 2016-06-02 22:20:32 +00:00
Billy Lamberta
97ae77e41b docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed am: a092b6cdb9 
am: 3050400767

* commit '3050400767dc1fa163bcfce11d5fe78fb168bb7a':

Change-Id: Ib68f95d8502f03530f72a6f22ad28cfee2af4824
 2016-06-02 22:19:16 +00:00
Jorim Jaggi
02082ad631 Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev 
am: 6321f42fbe

* commit '6321f42fbee425745de9636d45e4973fa6c470b9':
  Fix unminimizing dock stack for AppTask.moveToFront

Change-Id: I82b844611cb1761a681f91e2e26b25308202c6da
 2016-06-02 22:19:12 +00:00
Jorim Jaggi
a80c867adf Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev 
am: 6321f42fbe

* commit '6321f42fbee425745de9636d45e4973fa6c470b9':
  Fix unminimizing dock stack for AppTask.moveToFront

Change-Id: I8cb3702db22d24de2aa64360e8e22577f320d00d
 2016-06-02 22:19:12 +00:00
Billy Lamberta
3913df1e81 docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed am: a092b6cdb9 
am: 24b4156861

* commit '24b41568611961248d3d9ab906f667faa9b56015':
  docs: work minisite post-launch fixes

Change-Id: I0de2811e52c36211fac542b22ba4b9c5a24bc57a
 2016-06-02 22:14:19 +00:00
Billy Lamberta
3050400767 docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed 
am: a092b6cdb9

* commit 'a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
  docs: work minisite post-launch fixes

Change-Id: I39f4ea830be553013e8c9ce7989581b31fcbd994
 2016-06-02 22:10:08 +00:00
Annie Chin
84c074adb2 Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev 2016-06-02 22:10:01 +00:00
Billy Lamberta
24b4156861 docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed 
am: a092b6cdb9

* commit 'a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
  docs: work minisite post-launch fixes

Change-Id: If59f08e5eca51e6c21a53b01854b3e0dd6fac2a6
 2016-06-02 22:09:27 +00:00
TreeHugger Robot
6321f42fbe Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev 2016-06-02 22:08:15 +00:00
Jae Seo
22168a7dfc TIF: Set the surface secure 
Bug: 29104650
Change-Id: I481bf30c57a7c29faaf1cafe64607c22fe55f707
 2016-06-02 15:07:17 -07:00
Billy Lamberta
a092b6cdb9 docs: work minisite post-launch fixes am: 9fec73a47c 
am: 84903c24ed

* commit '84903c24ed74c75a2217648a96931cc3045143ea':
  docs: work minisite post-launch fixes

Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
 2016-06-02 22:04:13 +00:00
Billy Lamberta
84903c24ed docs: work minisite post-launch fixes 
am: 9fec73a47c

* commit '9fec73a47c158df0a184a1f2a0301b6394cfec40':
  docs: work minisite post-launch fixes

Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
 2016-06-02 21:59:29 +00:00
Pavlin Radoslavov
e47ec14318 Delay handleEnable() until Bluetooth state is OFF 
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.

Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.

Bug: 17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
 2016-06-02 14:56:31 -07:00
Andrii Kulian
206b9faa09 Fix task selection logic 
When task was selected for activity launched with flag FLAG_ACTIVITY_NEW_TASK
first matching task was omitted if there was another match lower in stack.
This lead to task shuffling in same stack.

Bug: 28848683
Change-Id: I94e55693fc7ed926fc151ba988d257bd2417dd45
 2016-06-02 14:54:44 -07:00
Andrew Solovay
8febcd4df7 docs: Update N release notes for DP4 
Archived the DP3 release notes, and set up the skeletal DP4 notes.
Also added information about changes to multi-window mode.

(Began this CL on mnc-io-docs, but CPing it to nyc-dev since that's
where we'll be doing the DP4 docs.)

See first comment for doc stage location.

bug: 28982873
bug: 28982952
Change-Id: I9dd8579db8b88788a89f046fe6cf2052390aade4
 2016-06-02 14:43:04 -07:00
Philip P. Moltmann
8ed5c53a38 Merge "Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f am: e498e847c8" into nyc-mr1-dev-plus-aosp 
am: 63ef4a9a07

* commit '63ef4a9a07798709c43d93864bfb26c2a1186f73':

Change-Id: I0d5381cbe93c7a5ae8f3412a14224449ae95347d
 2016-06-02 21:42:20 +00:00
Philip P. Moltmann
307cf05cd3 Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f am: 55d86c761a 
am: acd7740da7

* commit 'acd7740da71698fde7d5b770e495d72542617dc9':
  Move Xerox recommendation plugin to service.

Change-Id: I85caa9fa6f54ab67c655993d517f72022980bf8c
 2016-06-02 21:42:17 +00:00
Android Build Merger (Role)
63ef4a9a07 Merge "Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f am: e498e847c8" into nyc-mr1-dev-plus-aosp 2016-06-02 21:31:30 +00:00
Philip P. Moltmann
5e534f4bda Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f 
am: e498e847c8

* commit 'e498e847c81e39ba55432c26333f9244bc60b4ae':
  Move Xerox recommendation plugin to service.

Change-Id: I94d9416198264ee8006937bf5733547790a7fb65
 2016-06-02 21:31:00 +00:00
Philip P. Moltmann
acd7740da7 Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f 
am: 55d86c761a

* commit '55d86c761afd5069304f66018ed9b0815cec64b9':
  Move Xerox recommendation plugin to service.

Change-Id: I615a3f3977429a4fd32e976186338844bb57fbc5
 2016-06-02 21:30:52 +00:00
Roozbeh Pournader
63c8d4904d Merge "Unhide CharSequence APIs to BidiFormatter" 2016-06-02 21:29:10 +00:00
Philip P. Moltmann
55d86c761a Merge "Move Xerox recommendation plugin to service." into nyc-dev 
am: e509dcb43f

* commit 'e509dcb43fdbd949b18622a1dee7b9d7373dbabf':
  Move Xerox recommendation plugin to service.

Change-Id: I255f9f21bdcc97b2a53fddd276ae71233b8d3193
 2016-06-02 21:25:33 +00:00
Philip P. Moltmann
e498e847c8 Merge "Move Xerox recommendation plugin to service." into nyc-dev 
am: e509dcb43f

* commit 'e509dcb43fdbd949b18622a1dee7b9d7373dbabf':
  Move Xerox recommendation plugin to service.

Change-Id: I8bde4ef5c7aff566a7797ac95429a34656512048
 2016-06-02 21:25:22 +00:00
Julia Reynolds
63c63db957 Merge "Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 am: 480cb05866" into nyc-mr1-dev-plus-aosp 
am: 3237940a6c

* commit '3237940a6c64ad0dff579d13e37468836880af81':

Change-Id: Ic653a9db8ab6681a6995e15c1499e8643845fc49
 2016-06-02 21:25:07 +00:00
Julia Reynolds
d54da25b58 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 am: 84e725309c 
am: bad8e2e37c

* commit 'bad8e2e37c89fa99031838f8f40f6cf52a42deb3':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Iac59386fdb878007462c7a6a24770341d1db8914
 2016-06-02 21:25:04 +00:00
Chong Zhang
5070521956 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 am: 33508a49e8 
am: f7c1294fcf

* commit 'f7c1294fcf7d7717f62e983078ac20c8338047dd':

Change-Id: I2551c9c7a1d5774a3121f2c54b817708fa958876
 2016-06-02 21:25:02 +00:00
Android Build Merger (Role)
3237940a6c Merge "Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 am: 480cb05866" into nyc-mr1-dev-plus-aosp 2016-06-02 21:22:59 +00:00
Julia Reynolds
8d46733355 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 
am: 480cb05866

* commit '480cb05866ca47188ce77f0eb5a304b371223c7c':
  Fix memory leak via ZenModeController callbacks.

Change-Id: If765b78cd4b947dec5c9845f8d3981c584e743e6
 2016-06-02 21:22:34 +00:00
Eino-Ville Talvala
c62cea89ce Camera2: Update lensShadingMap documentation 
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to camera
device-processed data.

Also fix a few other wording issues in the lens shading documentation.

Bug: 18175853
Change-Id: I27691925e6496afe18f3506084d89f2523b5555d
 2016-06-02 14:21:27 -07:00
Julia Reynolds
bad8e2e37c Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 
am: 84e725309c

* commit '84e725309c468b9f8d49e25562b6ee400c79992e':
  Fix memory leak via ZenModeController callbacks.

Change-Id: I865083fdfb2ddaa77d772d77770c1a48859dc03c
 2016-06-02 21:21:27 +00:00
Chong Zhang
bf4debc5fb Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 am: 2f2af39911 
am: 426fdee24e

* commit '426fdee24e618e0c97f3c61b3a57958aa66e416e':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: Ieb1d675a6a3ae93c1e56e26ba16e23bbe62d0010
 2016-06-02 21:19:17 +00:00
Philip P. Moltmann
e509dcb43f Merge "Move Xerox recommendation plugin to service." into nyc-dev 2016-06-02 21:18:08 +00:00
Chong Zhang
f7c1294fcf Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 
am: 33508a49e8

* commit '33508a49e84db07be56148f53bf4c9c5404161c7':

Change-Id: I69e02ceadd4cbd2b09babdcc74a7353cc5b0d4e2
 2016-06-02 21:15:48 +00:00
Julia Reynolds
480cb05866 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: I7d8702f3761ed71b1c06f1eedaa5740cfc2e799e
 2016-06-02 21:14:34 +00:00
Julia Reynolds
84e725309c Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Id392b79729d9f8e560554859260845d3f0972548
 2016-06-02 21:14:09 +00:00
Chong Zhang
426fdee24e Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 
am: 2f2af39911

* commit '2f2af39911976974177e92099e27c10fe93beddd':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I145857ecc2a07ad1b7bb80334ff81c2d990bb199
 2016-06-02 21:11:53 +00:00
Chris Wren
8df0e59b7f Merge "leave more space for mr1 constants" 2016-06-02 21:09:45 +00:00
Chris Wren
e7396ff904 leave more space for mr1 constants 
Change-Id: I237abc2bb204aadeb3148ccdeb82495e317a0dac
 2016-06-02 17:08:21 -04:00
Christopher Tate
d86b87329c Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077 am: 4872e3df96 
am: 29f4289ae2

* commit '29f4289ae25ebc098b78d324a470456ea947a229':

Change-Id: I53ed4a8d069504be3170a8d5b15e4b1fba8c7683
 2016-06-02 21:07:58 +00:00
Makoto Onuki
0a86dd6120 Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev am: a9f262d649 
am: 4169184518

* commit '416918451846518d1ff42d45ad361a7b9df19934':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ie88b05c3997045bed66fc72b115f6f7e48b5d970
 2016-06-02 21:07:51 +00:00
Chris Wren
95a079adf2 Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232f3 
am: b58e350e92

* commit 'b58e350e9266b8ced268b21900ab6c065dcac218':
  ShortcutManager: Implement max # of shortcuts

Change-Id: Ide9c5923c0dca42b5285ddcadda0716f2f00084b
 2016-06-02 21:07:43 +00:00
Chong Zhang
2f2af39911 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev 
am: b1e24209f1

* commit 'b1e24209f16621fd095dacb615364bfd15dfe721':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: Idb326fa8e459aaf3a97d841c91b3ccefc48dad81
 2016-06-02 21:06:00 +00:00
Chong Zhang
33508a49e8 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev 
am: b1e24209f1

* commit 'b1e24209f16621fd095dacb615364bfd15dfe721':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I538add512f7899ced2e0f940b16c8c34df5a9681
 2016-06-02 21:05:58 +00:00