Commit Graph

53450 Commits

Author SHA1 Message Date
Yohei Yukawa
97261d7979 am 6df39517: am f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
* commit '6df395171de030be8aeca1f89c5b1641133fa2bb':
  Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
2015-06-17 04:43:10 +00:00
Yohei Yukawa
f4d225a4b5 Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
This is a follow up CL for Ifd05565ac0c057c46ec88a3fb9094c04934041d.

SpellCheckerSessionListenerImpl.taskToString(TASK_CANCEL) has
somehow returned "STATE_WAIT_CONNECTION" probably because of
a copy-and-paste mistake.

With this CL, it now returns "TASK_CANCEL", which is observable
only in debug log anyway though.

Bug: 21319642
Change-Id: Ib0bf11494bd3f210e6e8192fc25a33c65f7d313d
2015-06-16 21:19:00 -07:00
Yohei Yukawa
54090fef78 am cfcd232e: am e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
* commit 'cfcd232e453cbb9a0ce2ac1f61250680afdb1b52':
  Fix a reference leak in SpellCheckerSessionListenerImpl.
2015-06-17 03:13:23 +00:00
Yohei Yukawa
e34f0984bb Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 2015-06-17 02:54:08 +00:00
Junda Liu
603bf00fcb am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
* commit '25acdffa23be41c4e49021153983d67e9fa48e38':
  Remove hide_carrier_network_settings from Settings.
2015-06-16 23:32:58 +00:00
Maxim Bogatov
8cd453d11d am a09ee4a6: am e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev
* commit 'a09ee4a6a60080611ef31f16ecb9195da9ae3709':
  fix CTS: AccessibilityEndToEndTest failing
2015-06-16 23:14:01 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Matthew Williams
5df4154b1b am 53e8781d: am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev
* commit '53e8781dd7702aedd3eb1a12d61477269896b36e':
  Make sync settings restore more robust
2015-06-16 22:54:50 +00:00
Maxim Bogatov
e6ba94ce02 Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 2015-06-16 22:48:59 +00:00
Matthew Williams
15ce33873e Merge "Make sync settings restore more robust" into mnc-dev 2015-06-16 22:36:53 +00:00
dcashman
f176b3b5a5 am 95e1f8b2: am acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev
* commit '95e1f8b2362764af50c88328c30c06a5a4e89d15':
  Add keyset support for ECDSA public keys.
2015-06-16 22:36:08 +00:00
Maxim Bogatov
f399af3e5f fix CTS: AccessibilityEndToEndTest failing
ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes

b/21369265

Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac
2015-06-16 15:19:42 -07:00
dcashman
acc2df21de Merge "Add keyset support for ECDSA public keys." into mnc-dev 2015-06-16 22:14:35 +00:00
Adam Powell
3d501550ae am d5965799: am 8edfe18c: Merge "Fully remove Toolbar children when action views expand" into mnc-dev
* commit 'd59657997200c1bd4eb2f9b2b034357e1d5f5efe':
  Fully remove Toolbar children when action views expand
2015-06-16 22:04:06 +00:00
Adam Powell
93af99f21d am 749285a2: am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev
* commit '749285a23873cd134788b3affae39643b1543653':
  Fix crash in ToolbarActionBar when setting null custom view
2015-06-16 22:04:01 +00:00
Matthew Williams
53abfdb86c Make sync settings restore more robust
Bug: 18506992
Parent Bug: 17967106
Introduce a new state for ContentResolver#getIsSyncable.
This state specifies that an adapter should be disabled until
explicitly turned on by ContentResolver#setSyncAutomatically(true).
In this way we can restore disabled sync adapters and still allow
them to run their initialization logic later on when they are
re-enabled.

Change-Id: I03fd1f994c4bc982bbc723154ba20bb252efdf80
2015-06-16 14:46:59 -07:00
Adam Powell
8edfe18c19 Merge "Fully remove Toolbar children when action views expand" into mnc-dev 2015-06-16 21:30:13 +00:00
Adam Powell
26b27cab81 Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 2015-06-16 21:29:48 +00:00
Eino-Ville Talvala
70b68cdac4 am e652f928: am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev
* commit 'e652f928ad22b00b36271caace29a0fdd17dd9a2':
  Camera: Adjust intrinsic transform coordinate system.
2015-06-16 21:25:53 +00:00
Rubin Xu
befbdb00f9 am a4f1642b: am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
* commit 'a4f1642ba16c13779d6a8ef187096259bcd1fd6f':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
2015-06-16 21:25:28 +00:00
Chirag Shah
3db44d08ea am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.
2015-06-16 21:24:48 +00:00
Abodunrinwa Toki
a9eee50455 am 03c70cac: am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev
* commit '03c70cac9a0d9dc7c9f2c71b28aaf609393fdcf3':
  Fix floating toolbar flickers.
2015-06-16 21:24:34 +00:00
George Mount
b5f0e3bdba am 2a255904: am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
* commit '2a25590428d3fa8e01f74f214b7c4c2d1c712afe':
  Have the final setVisibility cause a requestLayout.
2015-06-16 21:24:30 +00:00
Benjamin Franz
3be79152cf am 84e38f68: am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
* commit '84e38f687819e47ffe3bae1fd2588d0f22fafa90':
  Update documentation for PASSWORD_QUALITY_SOMETHING
2015-06-16 21:24:20 +00:00
Abodunrinwa Toki
686a2e633c am 7ebde83a: am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
* commit '7ebde83a479f6447e0862e814830374a8477665b':
  Floating toolbar no longer obstructs the soft keyboard.
2015-06-16 21:24:10 +00:00
Narayan Kamath
ba6e9b12a2 am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev
* commit '2d13fe56eec54030fe09cae74c7a92be54c8bd19':
  Better systrace slices for application startup.
2015-06-16 21:24:04 +00:00
Paul Jensen
79cd02c4b0 am 8235c839: am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '8235c839aa9caaf6b36820007f928367bd829736':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-16 21:24:00 +00:00
Eino-Ville Talvala
b8bd8ab184 Camera: Adjust intrinsic transform coordinate system.
Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0
2015-06-16 11:45:33 -07:00
Rubin Xu
dd862aebda Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 2015-06-16 18:15:33 +00:00
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Abodunrinwa Toki
98f98dd19d Merge "Fix floating toolbar flickers." into mnc-dev 2015-06-16 15:54:26 +00:00
George Mount
209fb43376 Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 2015-06-16 15:27:27 +00:00
Abodunrinwa Toki
f444b5c3ae Fix floating toolbar flickers.
-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.

-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.

Bug: 21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0
2015-06-16 15:47:04 +01:00
Benjamin Franz
dbc86ad170 Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 2015-06-16 13:22:22 +00:00
Abodunrinwa Toki
6161c5b4cd Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 2015-06-16 12:29:55 +00:00
Narayan Kamath
275294dbce Merge "Better systrace slices for application startup." into mnc-dev 2015-06-16 11:50:57 +00:00
Paul Jensen
19769114b4 Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 2015-06-16 11:30:51 +00:00
Narayan Kamath
fbb32f6440 Better systrace slices for application startup.
This change adds three new timeslices :

- PostFork : As soon as possible after the app forks from the
  zygote. Can be used in conjunction with the system_server
  "Start proc:" event to derive an upper bound on fork() and
  zygote overhead.

- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
  and ActivityThread#main.

ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.

Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.

bug: 21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
2015-06-16 12:06:31 +01:00
Benjamin Franz
c6a9653e0a Update documentation for PASSWORD_QUALITY_SOMETHING
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.

Bug: 20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
2015-06-16 11:23:38 +01:00
Yohei Yukawa
f05ce728f9 Fix a reference leak in SpellCheckerSessionListenerImpl.
The primary goal of this CL is to address a reference leak
in SpellCheckerSession.SpellCheckerSessionListenerImpl if
the SpellCheckerSession is closed too early.  Here is the
minimum repro code.

  TextServicesManager tsm = (TextServicesManager)
          getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
  SpellCheckerSession session = tsm.newSpellCheckerSession(,
          Locale.ENGLISH, listener, false);
  session.close();

In order to make the state management reliable and easier to
debug, this CL replaces SpellCheckerSessionListenerImpl#mOpened
with an explicit state number so that we can tell three different
"not open" cases: 1) not connected yet and not closed yet, 2)
closed before establishing connection, and 3) closed after
establishing connection.

Bug: 21319642
Change-Id: Ifd05565ac0c057c46ec88a3fb9094c04934041d7
2015-06-16 00:29:28 -07:00
Jeff Sharkey
10d045cd08 am 716978e3: am 2cc03e56: Yet another user restriction.
* commit '716978e36b30f339e615eee289a8cbc6f68a4df4':
  Yet another user restriction.
2015-06-16 05:28:43 +00:00
Jeff Sharkey
835a40aac0 am 7f39beb2: am a65a1582: Merge "Update file size formatting." into mnc-dev
* commit '7f39beb28e2f20c54529848cbee3429d17ae76ec':
  Update file size formatting.
2015-06-16 05:10:51 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction.
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
2015-06-15 21:50:47 -07:00
Jeff Sharkey
a65a1582f5 Merge "Update file size formatting." into mnc-dev 2015-06-16 04:47:21 +00:00
Jeff Sharkey
b521feaed4 Update file size formatting.
Per UX, default strings should have space between value and units
resulting in "12.3 GB".  Add a formatting variant that returns the
various components for callers who want to build their own strings.

For now there is only one mounted emulated volume at a time, and
it's always the primary storage, so give it the default rootId to
keep old Uris working.

Change-Id: Ifcc72a91a6b397ee65dc92642153286186eb64ac
2015-06-15 21:39:28 -07:00
Erik Kline
47585f462a am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
* commit 'a01b9e6f43b2c5d6a083b34ae0c8140abb09806a':
  Add a test that Network#getNetworkHandle() behaves sanely.
2015-06-16 04:05:03 +00:00
Erik Kline
0d16281a03 Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev 2015-06-16 03:43:56 +00:00
Paul Jensen
434dde84ee Remove dead hidden ConnectivityManager and NetworkInfo APIs.
- There are no callers of
  NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
  code that deals with mIsConnectedToProvisioningNetwork being true,
  including the two ConnectiviyManager APIs.
- There are no callers of
  ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
  the code that reads this URL.
- There are no callers of
  ConnectivityManager.captivePortalCheckCompleted(), so remove this
  API which is currently a no-op.

Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
2015-06-16 02:07:36 +00:00
Ruben Brunk
629923b56e am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev
* commit 'e9a1f181ee35dd376803ea98214e1bdbdc9250ef':
  Add metadata for pre-distortion dimensions.
2015-06-16 01:31:49 +00:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00