Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
361,683 Commits 3 Branches 0 Tags
573051e9a3ae2b0fa3d802841f61d5101625f2d5
Commit Graph

361683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pengquan Meng
573051e9a3 Merge "Update ConnectionService API comment" 2018-03-07 19:57:00 +00:00
Nathan Harold
fe4a9a31a2 Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev am: 1a1dc60ff5 -s ours 
am: 3d92e55f6a  -s ours

Change-Id: Ibc5943b21b317dddb9ca035491aea5d5eaef4948
 2018-03-07 19:54:26 +00:00
yinxu
7374689302 Merge "Merge "Address the API review comments." am: 322ff16301 am: 904826d293" into pi-dev-plus-aosp 
am: c71071cf89

Change-Id: I858ca48ed78a648beea729e4ddf3caacdf3b7740
 2018-03-07 19:39:44 +00:00
Nathan Harold
3d92e55f6a Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev 
am: 1a1dc60ff5  -s ours

Change-Id: Ibe66b17722c908bcc3e1ad8c6f80a9151491e776
 2018-03-07 19:39:00 +00:00
Leon Scroggins
a0b807fc77 Merge "Draw AnimatedImageDrawable mirrored if desired" into pi-dev am: e781724b41 
am: e09775e34d

Change-Id: I4b2351468a7ef5fcdbefe84e349a74437820c61c
 2018-03-07 19:24:05 +00:00
Nathan Harold
1a1dc60ff5 Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev 
* changes:
  Update SignalStrength to use ASU for TD-SDCMA
  Customize the WCDMA signal strength based on RSCP
 2018-03-07 19:22:32 +00:00
Android Build Merger (Role)
c71071cf89 Merge "Merge "Address the API review comments." am: 322ff16301 am: 904826d293" into pi-dev-plus-aosp 2018-03-07 19:15:23 +00:00
yinxu
cd56112962 Merge "Address the API review comments." am: 322ff16301 
am: 904826d293

Change-Id: I4de5c601e23004c934684d995bb916b654a42247
 2018-03-07 19:15:01 +00:00
Leon Scroggins
e09775e34d Merge "Draw AnimatedImageDrawable mirrored if desired" into pi-dev 
am: e781724b41

Change-Id: I0ab5753074ec20b7c0600bcdb0d9f0e837951998
 2018-03-07 19:13:36 +00:00
Anton Hansson
f3d6277071 Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: 13310fef6e am: 250e9629f3 -s ours 
am: d4dcd2b3fb  -s ours

Change-Id: Ic93192b6ed8d4c69b07443bdc6cab665a79729df
 2018-03-07 19:08:25 +00:00
yinxu
904826d293 Merge "Address the API review comments." 
am: 322ff16301

Change-Id: I4892b391672b0f125d47d9ddec02c1645d7cb2d3
 2018-03-07 19:02:46 +00:00
Makoto Onuki
7fb0b98bf3 Merge "Avoid service wrapper initialization deadlock." into pi-dev am: 1e36211a96 
am: 80cd503cf3

Change-Id: I0787609a4602bdfd79cc76922088041173ad46a3
 2018-03-07 18:59:41 +00:00
Leon Scroggins
e781724b41 Merge "Draw AnimatedImageDrawable mirrored if desired" into pi-dev 2018-03-07 18:51:16 +00:00
Salvador Martinez
e5833a0b60 Merge "Fix duplicate text in battery string" into pi-dev am: 13da2a778f 
am: 72d3a7f267

Change-Id: If4cf06930d10fd6214c46c4e83113939c58e3233
 2018-03-07 18:48:36 +00:00
Anton Hansson
d4dcd2b3fb Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." am: 13310fef6e 
am: 250e9629f3  -s ours

Change-Id: I0e22d56dad8dbf35799ffa839ddfdb90abf3f3c3
 2018-03-07 18:46:17 +00:00
Android Build Merger (Role)
ca4a48262d Merge "Merge "Remove BIND_SLICE" into pi-dev am: 23b73c45fb am: e62fb572cf" 2018-03-07 18:43:45 +00:00
TreeHugger Robot
761862a256 Merge "Revert "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion""" 2018-03-07 18:43:24 +00:00
Jason Monk
b3e0e62938 Merge "Remove BIND_SLICE" into pi-dev am: 23b73c45fb 
am: e62fb572cf

Change-Id: I951e8666b455a6e2d288f6d7392c00a1964b32ac
 2018-03-07 18:43:21 +00:00
Anton Hansson
250e9629f3 Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." 
am: 13310fef6e

Change-Id: Idbd6c7575b15c68a34c75ae6e5a5dd5418cfab82
 2018-03-07 18:37:54 +00:00
Chavi Weingarten
6ea90fd1d3 Merge "Catch and log exceptions from setup or teardown of WindowTestBase" into pi-dev am: 34ab4d95ca 
am: 79fa2e2dec

Change-Id: Ida47f3895d0b859ddd940c155665f374ba1a7939
 2018-03-07 18:36:43 +00:00
Makoto Onuki
80cd503cf3 Merge "Avoid service wrapper initialization deadlock." into pi-dev 
am: 1e36211a96

Change-Id: I1413c9f37c6ae189292def463e1621983e2f87f2
 2018-03-07 18:33:12 +00:00
Salvador Martinez
72d3a7f267 Merge "Fix duplicate text in battery string" into pi-dev 
am: 13da2a778f

Change-Id: I42915c2b46b3763a6cf179599fc944a4e1339f8f
 2018-03-07 18:28:34 +00:00
Jason Monk
e62fb572cf Merge "Remove BIND_SLICE" into pi-dev 
am: 23b73c45fb

Change-Id: I7a1e727f3a69b6e98c06505ac42c5927e7e3cc67
 2018-03-07 18:22:24 +00:00
Tyler Gunn
06a96eab13 Merge "Ensure start of call properties are propagated to RemoteConnection." am: ecb46b610c am: e8cb4f4046 
am: d8879a2925

Change-Id: Ia523cee477a39c221953cda68c29579cb5f6ed76
 2018-03-07 18:19:50 +00:00
Chavi Weingarten
79fa2e2dec Merge "Catch and log exceptions from setup or teardown of WindowTestBase" into pi-dev 
am: 34ab4d95ca

Change-Id: I47c4bd38b6057c731e4d60c08ec378de12df9a69
 2018-03-07 18:12:09 +00:00
TreeHugger Robot
1e36211a96 Merge "Avoid service wrapper initialization deadlock." into pi-dev 2018-03-07 18:11:15 +00:00
Tyler Gunn
d8879a2925 Merge "Ensure start of call properties are propagated to RemoteConnection." am: ecb46b610c 
am: e8cb4f4046

Change-Id: I63af850b4bea2a8cfeada3cb7bf4d16762604524
 2018-03-07 18:06:52 +00:00
Lucas Dupin
b4083ab532 Merge "Disable color extraction for media" into pi-dev am: 20ebb0a6d8 
am: 0ce5fae47d

Change-Id: Ib842fd3bf1726e81e6ef8a9443fee273e26da964
 2018-03-07 18:03:44 +00:00
TreeHugger Robot
13da2a778f Merge "Fix duplicate text in battery string" into pi-dev 2018-03-07 18:02:27 +00:00
Jason Monk
23b73c45fb Merge "Remove BIND_SLICE" into pi-dev 2018-03-07 18:01:26 +00:00
Chavi Weingarten
34ab4d95ca Merge "Catch and log exceptions from setup or teardown of WindowTestBase" into pi-dev 2018-03-07 17:57:19 +00:00
Tyler Gunn
e8cb4f4046 Merge "Ensure start of call properties are propagated to RemoteConnection." 
am: ecb46b610c

Change-Id: I9e7e28c7197d8d002bb5d8956ef4624ac70cb24b
 2018-03-07 17:54:30 +00:00
Richard Ledley
aa85cd2ae3 Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev am: 847446d7f8 
am: b956d0b81d

Change-Id: I125d35f220d29fd7466d72b6080b9279f24962eb
 2018-03-07 17:53:59 +00:00
Lucas Dupin
0ce5fae47d Merge "Disable color extraction for media" into pi-dev 
am: 20ebb0a6d8

Change-Id: I02b9056b783fbbe95d8d641b908d9630408a76dd
 2018-03-07 17:52:17 +00:00
TreeHugger Robot
33d783fce6 Merge "TextClassifierService.onSelectionEvent" 2018-03-07 17:44:23 +00:00
Richard Ledley
b956d0b81d Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev 
am: 847446d7f8

Change-Id: I1ad63dda26b397c26fa05520103e504bcf6f8127
 2018-03-07 17:42:02 +00:00
Treehugger Robot
322ff16301 Merge "Address the API review comments." 2018-03-07 17:40:20 +00:00
Lucas Dupin
20ebb0a6d8 Merge "Disable color extraction for media" into pi-dev 2018-03-07 17:36:26 +00:00
Richard Ledley
847446d7f8 Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." into pi-dev 2018-03-07 17:30:20 +00:00
Annie Meng
75c79fc92c Merge "Validate restore of NetworkPolicy settings" into pi-dev am: 292d895fb2 
am: 886c797727

Change-Id: I95e1d29c499a935851c708969da5ae0596346c45
 2018-03-07 17:28:39 +00:00
TreeHugger Robot
c3e9df0512 Merge "Relax angle-related false touch classification." 2018-03-07 17:19:28 +00:00
Annie Meng
886c797727 Merge "Validate restore of NetworkPolicy settings" into pi-dev 
am: 292d895fb2

Change-Id: I0337e151e8a47d413153160081e640b49f945318
 2018-03-07 17:17:54 +00:00
Beverly
1cf28b4990 Merge "System sounds get its own dnd toggle" into pi-dev am: 5a169cf2f6 
am: dd333ffb28

Change-Id: Idb2d6232174dffd81d26639e8041ef07b211f830
 2018-03-07 17:09:36 +00:00
Annie Meng
292d895fb2 Merge "Validate restore of NetworkPolicy settings" into pi-dev 2018-03-07 17:07:51 +00:00
Beverly
dd333ffb28 Merge "System sounds get its own dnd toggle" into pi-dev 
am: 5a169cf2f6

Change-Id: Ie4b15e59d2f9ab16842af48ef07fc85191330a1a
 2018-03-07 16:53:11 +00:00
Android Build Merger (Role)
b329592fc8 Merge "Merge "Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration" into pi-dev am: a3e2d2fed8 am: 9dc058ba9f" 2018-03-07 16:50:00 +00:00
Rubin Xu
095fb33b2d Merge "Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration" into pi-dev am: a3e2d2fed8 
am: 9dc058ba9f

Change-Id: I22f0bcf9b51378b0a81ac43130b69a6680fd6497
 2018-03-07 16:49:30 +00:00
Phil Weaver
904eadc581 Merge "Fix accessibility action parceling" 2018-03-07 16:48:29 +00:00
Anton Hansson
13310fef6e Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." 2018-03-07 16:46:58 +00:00
TreeHugger Robot
5a169cf2f6 Merge "System sounds get its own dnd toggle" into pi-dev 2018-03-07 16:39:40 +00:00